Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Removes IAM Endpoint definition #206

Merged
merged 1 commit into from
Oct 13, 2020
Merged

fix: Removes IAM Endpoint definition #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions docker/docker-compose-agent-assist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ services:
- MEDIA_RELAY_HOST=media.relay:8080
- SIP_HOST=${EXTERNAL_IP}


- WATSON_CONVERSATION_URL=

# Configure either an SOE or reporting interface to receive the transcriptions (or both)
# SOE
#If your account is associated with an apikey uncomment WATSON_CONVERSATION_APIKEY and fill the apikey accordingly
#- WATSON_CONVERSATION_APIKEY=

#If your account is associated with a username and password uncomment WATSON_CONVERSATION_USERNAME and WATSON_CONVERSATION_PASSWORD
#- WATSON_CONVERSATION_USERNAME=
#- WATSON_CONVERSATION_PASSWORD=
#If your account is associated with an apikey uncomment WATSON_CONVERSATION_APIKEY and WATSON_CONVERSATION_TOKEN_SERVICE_PROVIDER_URL and fill apikey accordingly
#- WATSON_CONVERSATION_APIKEY=
#- WATSON_CONVERSATION_TOKEN_SERVICE_PROVIDER_URL=https://iam.bluemix.net/identity/token
- WATSON_CONVERSATION_URL=

# Reporting
- REPORTING_URL=
Expand All @@ -38,12 +40,13 @@ services:
- MEDIA_RELAY_LOG_LEVEL=DEBUG
- MEDIA_RELAY_WS_PORT=8080

# Creds for Bluemix STT
- WATSON_STT_URL=

# Credentials for IBM Cloud Speech-To-Text Service
#If your account is associated with an apikey uncomment WATSON_STT_APIKEY and fill the apikey accordingly
#- WATSON_STT_APIKEY=

#If your account is associated with a username and password uncomment WATSON_STT_USERNAME and WATSON_STT_PASSWORD and fill accordingly
#- WATSON_STT_USERNAME=
#- WATSON_STT_PASSWORD=
#If your account is associated with an apikey uncomment WATSON_STT_APIKEY and WATSON_STT_TOKEN_SERVICE_PROVIDER_URL and fill apikey accordingly
#- WATSON_STT_APIKEY=
#- WATSON_STT_TOKEN_SERVICE_PROVIDER_URL=https://iam.bluemix.net/identity/token
- WATSON_STT_URL=

34 changes: 17 additions & 17 deletions docker/docker-compose-self-service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ services:
- MEDIA_RELAY_HOST=media.relay:8080
- SIP_HOST=${EXTERNAL_IP}

# Uncomment and specify when the Conversation API is used
- WATSON_CONVERSATION_URL=
- WATSON_CONVERSATION_WORKSPACE_ID=

# API Key for IBM Cloud Watson Assistant Service
- WATSON_CONVERSATION_APIKEY=

#If your account is associated with a username and password uncomment WATSON_CONVERSATION_USERNAME and WATSON_CONVERSATION_PASSWORD and fill out accordingly
#- WATSON_CONVERSATION_USERNAME=
#- WATSON_CONVERSATION_PASSWORD=
#If your account is associated with an apikey uncomment WATSON_CONVERSATION_APIKEY and WATSON_CONVERSATION_TOKEN_SERVICE_PROVIDER_URL and fill apikey accordingly
#- WATSON_CONVERSATION_APIKEY=
#- WATSON_CONVERSATION_TOKEN_SERVICE_PROVIDER_URL=https://iam.bluemix.net/identity/token
- WATSON_CONVERSATION_URL=

# Logging related variables
- ENABLE_TRANSCRIPTION_AUDIT_MESSAGES=true
Expand All @@ -36,23 +36,23 @@ services:
- MEDIA_RELAY_LOG_LEVEL=DEBUG
- MEDIA_RELAY_WS_PORT=8080

# Creds for Bluemix STT
#If your account is associated with a username and password uncomment WATSON_STT_USERNAME and WATSON_STT_PASSWORD and fill out accordingly
- WATSON_STT_URL=
# API Key for IBM Cloud Speech-To-Text Service
- WATSON_STT_APIKEY=

#If your account is associated with a username and password uncomment WATSON_STT_USERNAME and WATSON_STT_PASSWORD and fill accordingly
#- WATSON_STT_USERNAME=
#- WATSON_STT_PASSWORD=
#If your account is associated with an apikey uncomment WATSON_STT_APIKEY and WATSON_STT_TOKEN_SERVICE_PROVIDER_URL and fill apikey accordingly
#- WATSON_STT_APIKEY=
#- WATSON_STT_TOKEN_SERVICE_PROVIDER_URL=https://iam.bluemix.net/identity/token
- WATSON_STT_URL=

# Creds for Bluemix TTS
#If your account is associated with a username and password uncomment WATSON_TTS_USERNAME and WATSON_TTS_PASSWORD and fill out accordingly


- WATSON_TTS_URL=
# API Key for IBM Cloud Text-To-Speech Service
- WATSON_TTS_APIKEY=

#If your account is associated with a username and password uncomment WATSON_TTS_USERNAME and WATSON_TTS_PASSWORD and fill accordingly
#- WATSON_TTS_USERNAME=
#- WATSON_TTS_PASSWORD=
#If your account is associated with an apikey uncomment WATSON_TTS_APIKEY and WATSON_TTS_TOKEN_SERVICE_PROVIDER_URL and fill apikey accordingly
#- WATSON_TTS_APIKEY=
#- WATSON_TTS_TOKEN_SERVICE_PROVIDER_URL=https://iam.bluemix.net/identity/token
- WATSON_TTS_URL=
- WATSON_TTS_VOICE=en-US_MichaelVoice

# Uncomment the following three lines to enable call recording
Expand Down
9 changes: 1 addition & 8 deletions kubernetes/single-tenant/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ spec:
key: WATSON_STT_APIKEY
- name: WATSON_STT_URL
value: https://stream.watsonplatform.net/speech-to-text/api
- name: WATSON_STT_TOKEN_SERVICE_PROVIDER_URL
value: https://iam.bluemix.net/identity/token
- name: WATSON_TTS_APIKEY
valueFrom:
secretKeyRef:
Expand All @@ -60,10 +58,7 @@ spec:
- name: WATSON_TTS_VOICE
value: en-US_MichaelVoice
- name: WATSON_TTS_URL
value: https://stream.watsonplatform.net/text-to-speech/api
- name: WATSON_TTS_TOKEN_SERVICE_PROVIDER_URL
value: https://iam.bluemix.net/identity/token

value: https://stream.watsonplatform.net/text-to-speech/api
# - name: SSL_CLIENT_CA_CERTIFICATE_FILE
# value: "/sslConf/clientCaCertFile"

Expand Down Expand Up @@ -137,8 +132,6 @@ spec:
secretKeyRef:
name: secret-creds
key: WATSON_CONVERSATION_APIKEY
- name: WATSON_CONVERSATION_TOKEN_SERVICE_PROVIDER_URL
value: https://iam.bluemix.net/identity/token
- name: ENABLE_AUDIT_MESSAGES
value: 'true'
- name: ENABLE_TRANSCRIPTION_AUDIT_MESSAGES
Expand Down
8 changes: 0 additions & 8 deletions voice-agent-tester/kubernetes/sample-deploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@
"name": "MEDIA_RELAY_WS_PORT",
"value": "8080"
},
{
"name": "WATSON_STT_TOKEN_SERVICE_PROVIDER_URL",
"value": "https://iam.bluemix.net/identity/token"
},
{
"name": "WATSON_STT_APIKEY",
"valueFrom": {
Expand All @@ -97,10 +93,6 @@
"name": "WATSON_STT_URL",
"value": "https://gateway-wdc.watsonplatform.net/speech-to-text/api"
},
{
"name": "WATSON_TTS_TOKEN_SERVICE_PROVIDER_URL",
"value": "https://iam.bluemix.net/identity/token"
},
{
"name": "WATSON_TTS_APIKEY",
"valueFrom": {
Expand Down