diff options
| -rw-r--r-- | heat/ONAP/cloud-config/clamp_vm_init.sh | 11 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 2 |
3 files changed, 11 insertions, 4 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.env b/heat/ONAP/onap_openstack.env index 96359bf9..7b19fbfe 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -149,7 +149,7 @@ parameters: optf_osdf_docker: "1.2.1" aaf_docker: "2.1.2-SNAPSHOT" sms_docker: "2.0.0" - nbi_docker: "2.0.0" + nbi_docker: "3.0.1" dbcl_docker: "1.0.12" dcae_docker: "1.1.3" 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 |