Merge "Added AAI Certs"

4 files changed, 29 insertions, 6 deletions

diff --git a/aai.cer b/aai.cer
new file mode 100755
index 0000000..c3b5998
--- /dev/null
+++ b/aai.cer
@@ -0,0 +1,3 @@
+-----BEGIN CERTIFICATE-----
+
+-----END CERTIFICATE-----
diff --git a/aai.key b/aai.key
new file mode 100755
index 0000000..2d5d401
--- /dev/null
+++ b/aai.key
@@ -0,0 +1,3 @@
+-----BEGIN RSA PRIVATE KEY-----
+
+-----END RSA PRIVATE KEY-----
diff --git a/aai_bundle.pem b/aai_bundle.pem
new file mode 100755
index 0000000..03536a5
--- /dev/null
+++ b/aai_bundle.pem
@@ -0,0 +1,17 @@
+# Issued to: Symantec Class 3 Secure Server CA - G4
+# Issued by: VeriSign Class 3 Public Primary Certification Authority - G5
+# Valid from: 10/30/2013 to 10/30/2023
+# Serial Number: ‎51 3f b9 74 38 70 b7 34 40 41 8d 30 93 06 99 ff  
+# https://knowledge.symantec.com/support/mpki-for-ssl-support/index?page=content&id=AR2064
+-----BEGIN CERTIFICATE-----
+
+-----END CERTIFICATE-----
+
+# Issued to: VeriSign Class 3 Public Primary Certification Authority - G5
+# Issued by: VeriSign Class 3 Public Primary Certification Authority - G5
+# Valid from: 11/7/2006 to 7/16/2036
+# Serial Number: ‎18 da d1 9e 26 7d e8 bb 4a 21 58 cd cc 6b 3b 4a
+# https://knowledge.symantec.com/support/ssl-certificates-support/index?page=content&id=SO5624
+-----BEGIN CERTIFICATE-----
+
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/conductor.conf b/conductor.conf
index 1a2dfac..150d78b 100755
--- a/conductor.conf
+++ b/conductor.conf
@@ -8,7 +8,7 @@
 #api_paste_config = api_paste.ini
 
 # Music keyspace for content (string value)
-keyspace = conductor_ikram
+keyspace = conductor
 
 #
 # From oslo.log
@@ -135,10 +135,10 @@ complex_cache_refresh_interval = 60
 
 # Base URL for A&AI, up to and not including the version, and without a
 # trailing slash. (string value)
-server_url = https://aai-conexus-e2e.ecomp.cci.att.com:8443/aai
+server_url = https://aai.api.simpledemo.onap.org:8443/aai
 
 # The version of A&AI in v# format. (string value)
-server_url_version = v11
+server_url_version = v13
 
 # SSL/TLS certificate file in pem format. This certificate must be registered
 # with the A&AI endpoint. (string value)
@@ -150,7 +150,7 @@ certificate_key_file = /usr/local/bin/aai_key.key
 # Certificate Authority Bundle file in pem format. Must contain the appropriate
 # trust chain for the Certificate file. (string value)
 #certificate_authority_bundle_file = /opt/app/conductor/etc/certs/ca_bundle.pem
-certificate_authority_bundle_file =/usr/local/bin/bundle.pem
+certificate_authority_bundle_file = /opt/optf-has/aai_cert.cer
 
 [api]
 
@@ -216,7 +216,7 @@ concurrent = true
 #
 
 # Music keyspace for messages (string value)
-keyspace = conductor_ikram_rpc
+keyspace = conductor_rpc
 
 # Wait interval while checking for a message response. Default value is 1
 # second. (integer value)
@@ -247,7 +247,7 @@ timeout = 300
 #
 music_new_version = True 
 # Base URL for Music REST API without a trailing slash. (string value)
-server_url = http://135.197.226.30:8080/MUSIC/rest/v2
+server_url = http://localhost:8080/MUSIC/rest/v2
 version = v2
 music_version = "2.4.21"
 aafuser = conductor