From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 11 Oct 2018 14:21:40 +0000 (+0000)
Subject: Merge "Add dashboard to Clamp VM"
X-Git-Tag: 1.3.0~14
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3d4a90e07accddbe8fde26df1335f12f87241b72;hp=bec4c697c2dc3cddb33fa9e3b595268a626cb26f;p=demo.git

Merge "Add dashboard to Clamp VM"
---

diff --git a/heat/ONAP/cloud-config/clamp_vm_init.sh b/heat/ONAP/cloud-config/clamp_vm_init.sh
index f8b26e30..3b730516 100644
--- a/heat/ONAP/cloud-config/clamp_vm_init.sh
+++ b/heat/ONAP/cloud-config/clamp_vm_init.sh
@@ -21,10 +21,17 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 
 docker pull $NEXUS_DOCKER_REPO/onap/clamp:$DOCKER_IMAGE_VERSION
 
-cd extra/docker/clamp/
+cd extra/docker/heat/
 
 # Change the Clamp docker image name in the docker-compose.yml to match the one downloaded
-sed -i "/image: onap\/clamp/c\    image: $NEXUS_DOCKER_REPO\/onap\/clamp:$DOCKER_IMAGE_VERSION" docker-compose.yml
+for image in "onap/clamp" "onap/clamp-dashboard-elasticsearch" "onap/clamp-dashboard-logstash" "onap/clamp-dashboard-kibana"
+do
+    sed -i "s@image: $image:latest@image: $NEXUS_DOCKER_REPO/$image:$DOCKER_IMAGE_VERSION@g" docker-compose.yml
+done
+
+# Ensure max_map_count is high enough for elasticsearch
+sysctl -w vm.max_map_count=262144
+echo "sysctl -w vm.max_map_count=262144" >> /etc/sysctl.conf
 
 # Start Clamp and MariaDB containers with docker compose and clamp/extra/docker/clamp/docker-compose.yml
 /opt/docker/docker-compose up -d
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index e2dc3abd..decb41c6 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1794,7 +1794,7 @@ resources:
     type: OS::Nova::Server
     properties:
       image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_medium }
+      flavor: { get_param: flavor_large }
       name:
         str_replace:
           template: base-clamp