Merge "Change template properties for AAI"

diff --combined deliveries/src/main/docker/docker-files/Dockerfile
index 4b04e22,33c3ac1..a115b5f
--- 1/deliveries/src/main/docker/docker-files/Dockerfile
--- 2/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\r
 +\r
  # add vim and uncomment alias to speedup troubleshooting purpose\r
  RUN apt-get update && apt-get install -y \\r
        openjdk-8-jdk vim net-tools\r
  \r
 -RUN sed -i 's/# alias/alias/g' /root/.bashrc\r
 +COPY conf.d/ /etc/onap/vid/conf.d/\r
  \r
 -RUN mkdir -p ${ROOT_DIR}/etc\r
 +RUN sed -i 's/# alias/alias/g' /root/.bashrc\r
  \r
 -ENV JAVA_OPTS="-Xmx1536m -Xms1536m"\r
 +ENV JAVA_OPTS="-Xmx1536m -Xms1536m -Dlogback.configurationFile=/etc/onap/vid/conf.d/logback.xml"\r
  \r
  ENV ROOT_DIR /opt/app/vid\r
  \r
@@@ -26,8 -25,7 +26,7 @@@ ENV LOG4J_LOGLEVEL INF
  ENV LOG4J_APPENDER rollingfile\r
  ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs\r
  \r
- ENV VID_AAI_HOST aai.api.simpledemo.onap.org\r
- ENV VID_AAI_PORT 8443\r
+ ENV VID_AAI_URL https://aai.api.simpledemo.onap.org:8443\r
  ENV VID_APP_DISPLAY_NAME VID\r
  ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context\r
  ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra\r
@@@ -88,4 -86,4 +87,4 @@@ ADD maven/artifacts/vid.war /tmp/vid/st
  \r
  RUN chmod +x /tmp/vid/localize.sh\r
  \r
 -CMD ["/tmp/vid/localize.sh"]\r
 +CMD ["/tmp/vid/localize.sh"]