summaryrefslogtreecommitdiffstats
path: root/kubernetes/oof/charts/oof-has/resources
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-05-06 06:14:59 +0000
committerGerrit Code Review <gerrit@onap.org>2020-05-06 06:14:59 +0000
commitb5c12abb08cabeb0d6b6b593eb8b7068f8a93d81 (patch)
tree15f40d5e39a83e83fc11198b6d29bb2ef8a6a560 /kubernetes/oof/charts/oof-has/resources
parenta183088f2baaa5d794b8b5f67eceb5f65b7fc318 (diff)
parent08d7b637aa40344d12daa7d4f9e4e9fff8d15e17 (diff)
Merge "MUSIC spring boot helm charts (music-sb)"
Diffstat (limited to 'kubernetes/oof/charts/oof-has/resources')
-rwxr-xr-xkubernetes/oof/charts/oof-has/resources/config/conductor.conf11
1 files changed, 9 insertions, 2 deletions
diff --git a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
index c3d9307836..94a47fed2f 100755
--- a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
+++ b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
@@ -428,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)
@@ -492,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)
@@ -508,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]