summaryrefslogtreecommitdiffstats
path: root/conductor
diff options
context:
space:
mode:
authordhebeha <dhebeha.mj71@wipro.com>2020-04-30 00:10:54 +0530
committervrvarma <vikas.varma@att.com>2020-04-29 15:56:07 -0400
commitbb53f794e64d92bd24c4a7027315612cde6550a6 (patch)
treee38e36733271ec48d7963d38bea9793ba592c1c1 /conductor
parentca1d19b785a9ffca4946a8a10cf96fd674f3d400 (diff)
enable https mode when using serverurl in music
Issue-ID: OPTFRA-747 Signed-off-by: dhebeha <dhebeha.mj71@wipro.com> Change-Id: I8ca13756bea53d63aae1bea50705fc531a82088e
Diffstat (limited to 'conductor')
-rw-r--r--conductor/conductor/common/music/api.py4
-rw-r--r--conductor/pom.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/conductor/conductor/common/music/api.py b/conductor/conductor/common/music/api.py
index 77b6a5a..dba852a 100644
--- a/conductor/conductor/common/music/api.py
+++ b/conductor/conductor/common/music/api.py
@@ -118,6 +118,8 @@ class MusicAPI(object):
LOG.info(_LI("Initializing Music API"))
server_url = CONF.music_api.server_url.rstrip('/')
+ if server_url and server_url.startswith('https'):
+ CONF.music_api.enable_https_mode = True
if not server_url:
# host/port/path are deprecated and should not be used anymore.
# Defaults removed from oslo_config to give more incentive.
@@ -142,8 +144,6 @@ class MusicAPI(object):
# Set one parameter for connection mode
# Currently depend on music version
if CONF.music_api.enable_https_mode:
- self.rest.server_url = 'https://{}:{}/{}'.format(
- host, port, version, path.rstrip('/').lstrip('/'))
self.rest.session.verify = CONF.music_api.certificate_authority_bundle_file
if CONF.music_api.music_new_version:
diff --git a/conductor/pom.xml b/conductor/pom.xml
index ad93782..d99f0ca 100644
--- a/conductor/pom.xml
+++ b/conductor/pom.xml
@@ -22,13 +22,13 @@
<parent>
<groupId>org.onap.optf.has</groupId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<artifactId>optf-has</artifactId>
</parent>
<groupId>org.onap.optf.has</groupId>
<artifactId>optf-has-conductor</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<name>optf-has-conductor</name>
<description>Homing Allocation Service/Conductor</description>