From 6d50f6aff069772e8302ee626ab19db2d60c9e6c Mon Sep 17 00:00:00 2001 From: biniek Date: Mon, 5 Nov 2018 15:21:51 +0100 Subject: Change template properties for AAI Change-Id: I5412a152e6df701d94c8dffbc2a22d70e282008c Issue-ID: VID-343 Signed-off-by: biniek --- deliveries/src/main/docker/docker-files/Dockerfile | 3 +-- deliveries/src/main/scripts/localize_system.sh | 3 +-- .../src/main/webapp/WEB-INF/conf/system_template.properties | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile index 8cd2bc7aa..33c3ac1a1 100755 --- a/deliveries/src/main/docker/docker-files/Dockerfile +++ b/deliveries/src/main/docker/docker-files/Dockerfile @@ -25,8 +25,7 @@ ENV LOG4J_LOGLEVEL INFO ENV LOG4J_APPENDER rollingfile ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs -ENV VID_AAI_HOST aai.api.simpledemo.onap.org -ENV VID_AAI_PORT 8443 +ENV VID_AAI_URL https://aai.api.simpledemo.onap.org:8443 ENV VID_APP_DISPLAY_NAME VID ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra diff --git a/deliveries/src/main/scripts/localize_system.sh b/deliveries/src/main/scripts/localize_system.sh index 0947d49ea..a7e6cd3ba 100755 --- a/deliveries/src/main/scripts/localize_system.sh +++ b/deliveries/src/main/scripts/localize_system.sh @@ -13,8 +13,7 @@ sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \ -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \ -e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \ -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \ - -e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \ - -e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \ + -e 's ${VID_AAI_URL} '${VID_AAI_URL}' g' \ -e 's/${AAI_USE_CLIENT_CERT}/'${AAI_USE_CLIENT_CERT}'/g' \ -e 's/${AAI_VID_UID}/'${AAI_VID_UID}'/g' \ -e 's/${AAI_VID_PASSWD_X}/'${AAI_VID_PASSWD_X}'/g' \ diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties index 06a2e6b53..149ad99ed 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties @@ -64,10 +64,10 @@ element_map_file_path = /tmp element_map_icon_path = app/vid/icons/ #aai related properties -aai.server.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/ -aai.server.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/v13/ -aai.oldserver.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/ -aai.oldserver.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/v3/ +aai.server.url.base=${VID_AAI_URL}/aai/ +aai.server.url=${VID_AAI_URL}/aai/v13/ +aai.oldserver.url.base=${VID_AAI_URL}/aai/servers/ +aai.oldserver.url=${VID_AAI_URL}/aai/servers/v3/ aai.truststore.filename=${AAI_TRUSTSTORE_FILENAME} aai.truststore.passwd.x=${AAI_TRUSTSTORE_PASSWD_X} aai.keystore.filename=${AAI_KEYSTORE_FILENAME} -- cgit 1.2.3-korg