summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorac2550 <ac2550@intl.att.com>2018-10-11 14:09:23 +0200
committerac2550 <ac2550@intl.att.com>2018-10-11 14:35:16 +0200
commit757a0f1ccd60aecd3d22d49a3c88a4b8b452fbcb (patch)
tree02d74f053ca1d5c1d63cea4cf10b31234adc3c0b
parent79b9f0c5f642c20939b74854805e4ca62744401f (diff)
Add dashboard to Clamp VM
Change-Id: I048a609bb0526b4167a105f0e1b09b6cdea2217a Issue-ID: CLAMP-230 Signed-off-by: ac2550 <ac2550@intl.att.com>
-rw-r--r--heat/ONAP/cloud-config/clamp_vm_init.sh11
-rw-r--r--heat/ONAP/onap_openstack.yaml2
2 files changed, 10 insertions, 3 deletions
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