diff options
| author |   Shankaranarayanan Puzhavakath Narayanan <snarayanan@research.att.com> | 2018-04-23 19:55:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-23 19:55:37 +0000 |
| commit | 6a441d581ad626efc5bffafff95ab940f916b782 (patch) | |
| tree | 082710bdeb43c017699d0817c160bd01b4c03171 /conductor.conf | |
| parent | 016136075c9eaa351afc3fd8613233ae8a3db260 (diff) | |
| parent | ddc6bbd811d8617b2a2a1dde571f3937c0a81b5b (diff) | |
Merge "Added AAI Certs"
Diffstat (limited to 'conductor.conf')
| -rwxr-xr-x | conductor.conf | 12 |
1 files changed, 6 insertions, 6 deletions
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 |