Bump version of staging to 1.3.1

[optf/has.git] / conductor.conf

diff --git a/conductor.conf b/conductor.conf
index 18dad13..0c0ae2b 100755 (executable)
--- a/conductor.conf
+++ b/conductor.conf
@@ -131,20 +131,30 @@
 #fatal_deprecations = false
 
 
-[aaf_authentication]
+[aaf_api]
 
 #
 # From conductor
 #
 
 # is_aaf_enabled. (boolean value)
-#is_aaf_enabled = true
+#is_aaf_enabled = false
 
 # 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 = https://aaf-service:8100/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 = AAF_RootCA.cer
 
 # aaf_retries. (integer value)
 #aaf_retries = 3
@@ -153,7 +163,7 @@ aaf_url = http://aaf-service:8100/authz/perms/user/
 #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]
@@ -162,6 +172,9 @@ aaf_url = http://aaf-service:8100/authz/perms/user/
 # From conductor
 #
 
+# Is Secret Management service enabled (boolean value)
+#is_enabled = true
+
 # Base URL for SMS, up to and not including the version, and without a trailing
 # slash. (string value)
 #aaf_sms_url = https://aaf-sms.onap:10443
@@ -173,7 +186,7 @@ aaf_url = http://aaf-service:8100/authz/perms/user/
 # be False and the server certis not verified by the client. (string value)
 #aaf_ca_certs = AAF_RootCA.cer
 
-# Domain Name for HAS
+# Domain Name for HAS (string value)
 #secret_domain = has
 
 
@@ -224,10 +237,10 @@ certificate_key_file =
 certificate_authority_bundle_file = /usr/local/bin/AAF_RootCA.cer
 
 # Username for AAI. (string value)
-username = OOF
+#username =
 
 # Password for AAI. (string value)
-password = OOF
+#password =
 
 
 [api]
@@ -255,11 +268,9 @@ password = OOF
 
 # username for plans. (string value)
 #username =
-username = admin1
 
 # password for plans. (string value)
 #password =
-password = plan.15
 
 # auth toggling. (boolean value)
 #basic_auth_secure = true
@@ -461,21 +472,18 @@ music_new_version = True
 
 # for version (string value)
 #music_version = <None>
-music_version = "2.5.3"
+music_version = "3.0.23"
 
 # username value that used for creating basic authorization header (string
 # value)
 #aafuser = <None>
-aafuser = conductor
 
 # password value that used for creating basic authorization header (string
 # value)
 #aafpass = <None>
-aafpass = c0nduct0r
 
 # AAF namespace field used in MUSIC request header (string value)
 #aafns = <None>
-aafns = conductor
 
 
 [prometheus]
@@ -536,11 +544,9 @@ server_url = https://sdnc.onap:8282/restconf/
 
 # Basic Authentication Username (string value)
 #username = <None>
-username = admin
 
 # Basic Authentication Password (string value)
 #password = <None>
-password = Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 # Timeout for SDNC Rest Call (string value)
 #sdnc_rest_timeout = 30
@@ -598,3 +604,4 @@ concurrent = true
 
 # Extensions list to use (list value)
 #extensions = multicloud
+