summaryrefslogtreecommitdiffstats
path: root/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2018-05-31 17:13:59 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-31 17:13:59 +0000
commit08b9d7917c4bdf33cbb259306970d1763197b4c8 (patch)
treefc1d99f1aec4309410acc08da509ce4d361f6aa1 /kubernetes/oof/charts/oof-has/resources/config/conductor.conf
parentf7e3874f51f6edebb4e9b7618182bfba3fb905f8 (diff)
parent3a63d430a872be94813261168a48033837e916ae (diff)
Merge "Fix OOF configuration for connectivity"
Diffstat (limited to 'kubernetes/oof/charts/oof-has/resources/config/conductor.conf')
-rwxr-xr-xkubernetes/oof/charts/oof-has/resources/config/conductor.conf45
1 files changed, 40 insertions, 5 deletions
diff --git a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
index 4d32deea33..588b9360ba 100755
--- a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
+++ b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
@@ -149,22 +149,29 @@ 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://oof.api.simpledemo.onap.org:8443/aai
+server_url = https://{{.Values.config.aai.serviceName}}.{{ include "common.namespace" . }}:{{.Values.config.aai.port}}/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)
-certificate_file = /usr/local/bin/aai_cert.cer
+certificate_file =
# Private Certificate Key file in pem format. (string value)
-certificate_key_file = /usr/local/bin/aai_key.key
+certificate_key_file =
# 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 =/usr/local/bin/AAF_RootCA.cer
+
+# Basic Authentication Username (string value)
+username = OOF
+
+# Basic Authentication Password (string value)
+password = OOF
+
[api]
@@ -355,3 +362,31 @@ concurrent = true
[reservation]
concurrent = true
+
+[multicloud]
+
+#
+# From conductor
+#
+
+# Base URL for Multicloud without a trailing slash. (string value)
+server_url = http://{{.Values.config.msb.serviceName}}:{{.Values.config.msb.port}}/api/multicloud
+
+# Timeout for Multicloud Rest Call (string value)
+multicloud_rest_timeout = 30
+
+# Number of retry for Multicloud Rest Call (string value)
+multicloud_retries = 3
+
+# The version of Multicloud API. (string value)
+server_url_version = v0
+
+
+[vim_controller]
+#
+# From conductor
+#
+
+# Extensions list to use (list value)
+extensions = multicloud
+