diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2022-11-08 10:01:54 +0100 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2022-11-08 10:05:52 +0100 |
| commit | aa75c52fb2cfe333bd8fdfdb24b9bfb4589f5b10 (patch) | |
| tree | 25a6423725fe1bf8414a22f58dac165a89b06046 | |
| parent | 373c3674f7c2491bb6789272373a323136fd2208 (diff) | |
Fix AAI protocol setting problem for ServiceMesh
AAI access protocol is hardcoded to https in the vimbroker
This patch enables the configuration setting for AAI_PROTOCOL
Issue-ID: MULTICLOUD-1495
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I7e7d3d22ff11f154ddd8ba10bf05c4b0e09999c2
| -rw-r--r-- | multivimbroker/docker/Dockerfile | 1 | ||||
| -rw-r--r-- | multivimbroker/docker/pecan/Dockerfile | 1 | ||||
| -rw-r--r-- | multivimbroker/multivimbroker/pub/config/config.py | 3 | ||||
| -rwxr-xr-x | multivimbroker/run.sh | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile index 86841de..8bcd6e5 100644 --- a/multivimbroker/docker/Dockerfile +++ b/multivimbroker/docker/Dockerfile @@ -9,6 +9,7 @@ ENV AAI_PORT "8443" ENV AAI_SCHEMA_VERSION "v11" ENV AAI_USERNAME "AAI" ENV AAI_PASSWORD "AAI" +ENV AAI_PROTOCOL "https" EXPOSE 9001 diff --git a/multivimbroker/docker/pecan/Dockerfile b/multivimbroker/docker/pecan/Dockerfile index 5230182..ae225b6 100644 --- a/multivimbroker/docker/pecan/Dockerfile +++ b/multivimbroker/docker/pecan/Dockerfile @@ -7,6 +7,7 @@ ENV AAI_PORT "8443" ENV AAI_SCHEMA_VERSION "v11" ENV AAI_USERNAME "AAI" ENV AAI_PASSWORD "AAI" +ENV AAI_PROTOCOL "https" EXPOSE 9001 diff --git a/multivimbroker/multivimbroker/pub/config/config.py b/multivimbroker/multivimbroker/pub/config/config.py index 350bc92..90c38ec 100644 --- a/multivimbroker/multivimbroker/pub/config/config.py +++ b/multivimbroker/multivimbroker/pub/config/config.py @@ -24,7 +24,8 @@ MSB_SERVICE_PORT = '10080' # [A&AI] AAI_ADDR = "aai.api.simpledemo.openecomp.org" AAI_PORT = "8443" -AAI_SERVICE_URL = 'https://%s:%s/aai' % (AAI_ADDR, AAI_PORT) +AAI_PROTOCOL = "https" +AAI_SERVICE_URL = '%s://%s:%s/aai' % (AAI_PROTOCOL, AAI_ADDR, AAI_PORT) AAI_SCHEMA_VERSION = "v13" AAI_USERNAME = 'AAI' AAI_PASSWORD = 'AAI' diff --git a/multivimbroker/run.sh b/multivimbroker/run.sh index 1079cf1..9dc4c9e 100755 --- a/multivimbroker/run.sh +++ b/multivimbroker/run.sh @@ -21,6 +21,7 @@ sed -i "s/AAI_PORT =.*/AAI_PORT = \"${AAI_PORT}\"/g" multivimbroker/pub/config/c sed -i "s/AAI_SCHEMA_VERSION =.*/AAI_SCHEMA_VERSION = \"${AAI_SCHEMA_VERSION}\"/g" multivimbroker/pub/config/config.py sed -i "s/AAI_USERNAME =.*/AAI_USERNAME = \"${AAI_USERNAME}\"/g" multivimbroker/pub/config/config.py sed -i "s/AAI_PASSWORD =.*/AAI_PASSWORD = \"${AAI_PASSWORD}\"/g" multivimbroker/pub/config/config.py +sed -i "s/AAI_PROTOCOL =.*/AAI_PROTOCOL = \"${AAI_PROTOCOL}\"/g" multivimbroker/pub/config/config.py logDir="/var/log/onap/multicloud/multivimbroker" if [ ! -x $logDir ]; then |