From: Ofir Sonsino <ofir.sonsino@intl.att.com>
Date: Tue, 4 Dec 2018 13:58:17 +0000 (+0000)
Subject: Merge "Change template properties for AAI"
X-Git-Tag: 4.0.0~112
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7cdf140ac9f7950dacb8110b17190a188a2189bf;hp=-c;p=vid.git

Merge "Change template properties for AAI"
---

7cdf140ac9f7950dacb8110b17190a188a2189bf
diff --combined deliveries/src/main/docker/docker-files/Dockerfile
index 4b04e22cf,33c3ac1a1..a115b5f02
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@@ -1,14 -1,13 +1,14 @@@
  FROM tomcat:8.0-jre8
 +
  # add vim and uncomment alias to speedup troubleshooting purpose
  RUN apt-get update && apt-get install -y \
  	openjdk-8-jdk vim net-tools
  
 -RUN sed -i 's/# alias/alias/g' /root/.bashrc
 +COPY conf.d/ /etc/onap/vid/conf.d/
  
 -RUN mkdir -p ${ROOT_DIR}/etc
 +RUN sed -i 's/# alias/alias/g' /root/.bashrc
  
 -ENV JAVA_OPTS="-Xmx1536m -Xms1536m"
 +ENV JAVA_OPTS="-Xmx1536m -Xms1536m -Dlogback.configurationFile=/etc/onap/vid/conf.d/logback.xml"
  
  ENV ROOT_DIR /opt/app/vid
  
@@@ -26,8 -25,7 +26,7 @@@ ENV LOG4J_LOGLEVEL INF
  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
@@@ -88,4 -86,4 +87,4 @@@ ADD maven/artifacts/vid.war /tmp/vid/st
  
  RUN chmod +x /tmp/vid/localize.sh
  
 -CMD ["/tmp/vid/localize.sh"]
 +CMD ["/tmp/vid/localize.sh"]