X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foof%2Fcharts%2Foof-has%2Fresources%2Fconfig%2Fconductor.conf;h=881ed22562cf13f5c0f0f018c80b189e3b7efa84;hb=07e2d45bd8e61604a025defdf0123fa8f787b8a0;hp=32213319a71476ed99d580033a0a968df549b8df;hpb=6723eb71240790956e0a9961019b451296a6d307;p=oom.git

diff --git a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
index 32213319a7..881ed22562 100755
--- 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,22 +147,33 @@ log_config_append = /usr/local/bin/log.conf
 # Enables or disables fatal status of deprecations. (boolean value)
 #fatal_deprecations = false
 
+[auth]
+appkey = ""
 
-[aaf_authentication]
+[aaf_api]
 
 #
 # From conductor
 #
 
 # is_aaf_enabled. (boolean value)
-is_aaf_enabled = false
+is_aaf_enabled = true
 
 # aaf_cache_expiry_hrs. (integer value)
-#aaf_cache_expiry_hrs = 3
+aaf_cache_expiry_hrs = 3
 
 # aaf_url. (string value)
-#aaf_url = http://aaf-service:8100/authz/perms/user/
-aaf_url = http://{{.Values.config.aaf.serviceName}}.{{ include "common.namespace" . }}:{{.Values.config.aaf.port}}/authz/perms/user/
+aaf_url = https://{{.Values.config.aaf.serviceName}}:{{.Values.config.aaf.port}}/authz/perms/user/
+
+# aaf_cert_file. (string value)
+#aaf_cert_file = <None>
+
+# aaf_cert_key_file. (string value)
+#aaf_cert_key_file = <None>
+
+# aaf_ca_bundle_file. (string value)
+#aaf_ca_bundle_file =
+aaf_ca_bundle_file = /usr/local/bin/AAF_RootCA.cer
 
 # aaf_retries. (integer value)
 #aaf_retries = 3
@@ -171,7 +182,7 @@ aaf_url = http://{{.Values.config.aaf.serviceName}}.{{ include "common.namespace
 #aaf_timeout = 100
 
 # aaf_user_roles. (list value)
-#aaf_user_roles = {"type": "org.onap.oof","instance": "plans","action": "GET"},{"type": "org.onap.oof","instance": "plans","action": "POST"}
+#aaf_permissions = {"type": "org.onap.oof.access","instance": "*","action": "*"}
 
 
 [aaf_sms]
@@ -227,7 +238,7 @@ server_url = https://{{.Values.config.aai.serviceName}}.{{ include "common.names
 #aai_retries = 3
 
 # The version of A&AI in v# format. (string value)
-server_url_version = v14
+server_url_version = v19
 
 # SSL/TLS certificate file in pem format. This certificate must be registered
 # with the A&AI endpoint. (string value)
@@ -417,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)
@@ -481,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)
@@ -497,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]
 
@@ -551,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>
@@ -568,7 +585,6 @@ password = Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 # Retry Numbers for SDNC Rest Call (string value)
 #sdnc_retries = 3
 
-
 [service_controller]
 
 #