Merge "Fix name convention issue (SDC-WORKFLOW)"

[oom.git] / kubernetes / oof / charts / oof-has / resources / config / conductor.conf

diff --git a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
index 4db857a..94a47fe 100755 (executable)
--- a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
+++ b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
@@ -20,7 +20,7 @@
 #
 
 # Configuration file for WSGI definition of API. (string value)
-#api_paste_config = api_paste.ini
+api_paste_config = /usr/local/etc/conductor/api_paste.ini
 
 # Music keyspace for content (string value)
 #keyspace = conductor
@@ -147,6 +147,8 @@ log_config_append = /usr/local/bin/log.conf
 # Enables or disables fatal status of deprecations. (boolean value)
 #fatal_deprecations = false
 
+[auth]
+appkey = ""
 
 [aaf_api]
 
@@ -426,7 +428,7 @@ server_url = http://{{.Values.config.msb.serviceName}}.{{ include "common.namesp
 
 # Base URL for Music REST API without a trailing slash. (string value)
 #server_url = http://oof-has-music:8080/MUSIC/rest/v2
-server_url = http://{{.Values.config.music.serviceName}}.{{ include "common.namespace" . }}:{{.Values.config.music.port}}/MUSIC/rest/v2
+server_url = https://{{.Values.config.music.serviceName}}.{{ include "common.namespace" . }}:{{.Values.config.music.port}}/MUSIC/rest/v2
 version = v2
 
 # DEPRECATED: List of hostnames (round-robin access) (list value)
@@ -490,7 +492,7 @@ music_new_version = True
 
 # for version (string value)
 #music_version = <None>
-music_version = "3.0.21"
+music_version = "3.2.40"
 
 # username value that used for creating basic authorization header (string
 # value)
@@ -506,6 +508,13 @@ aafpass = c0nduct0r
 #aafns = <None>
 aafns = conductor
 
+# Enabling HTTPs mode (boolean value)
+enable_https_mode = True
+
+# Certificate Authority Bundle file in pem format. Must contain the appropriate
+# trust chain for the Certificate file. (string value)
+certificate_authority_bundle_file = /usr/local/bin/AAF_RootCA.cer
+
 
 [prometheus]
 
@@ -560,8 +569,7 @@ concurrent = true
 #table_prefix = sdnc
 
 # Base URL for SDN-C, up to and including the version. (string value)
-#server_url = https://controller:8443/restconf/
-server_url = https://sdncodl-conexus-e2e.ecomp.cci.att.com:8543/restconf/
+server_url = https://controller:8443/restconf/
 
 # Basic Authentication Username (string value)
 #username = <None>
@@ -577,7 +585,6 @@ password = Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 # Retry Numbers for SDNC Rest Call (string value)
 #sdnc_retries = 3
 
-
 [service_controller]
 
 #