Update the haproxy to use the latest certificate

Issue-ID: AAI-44
Change-Id: Idd974aed55130e9005165d7b19c81bd1043d0b6f
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index 087f8bf..1002540 100755 (executable)
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -53,6 +53,7 @@ fi;
 export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1);
 export DOCKER_REGISTRY="${DOCKER_REGISTRY:-localhost:5000}";
 export AAI_HAPROXY_IMAGE="${AAI_HAPROXY_IMAGE:-aaionap/haproxy}";
+export AAI_HAPROXY_VERSION="${AAI_HAPROXY_VERSION:-1.1.0}";
 
 NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 68bcf2b..365df96 100644 (file)
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -39,7 +39,7 @@ services:
         max-size: "30m"
         max-file: "5"
   aai.api.simpledemo.openecomp.org:
-    image: ${AAI_HAPROXY_IMAGE}
+    image: ${AAI_HAPROXY_IMAGE}:${AAI_HAPROXY_VERSION}
     hostname: aai.api.simpledemo.openecomp.org
     ports:
       - 8443:8443