diff options
| -rw-r--r-- | boot/appc_vm_init.sh | 2 | ||||
| -rw-r--r-- | boot/oof_install.sh | 14 | ||||
| -rw-r--r-- | boot/policy_vm_init.sh | 6 | ||||
| -rw-r--r-- | boot/vid_vm_init.sh | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 |
6 files changed, 22 insertions, 10 deletions
diff --git a/boot/appc_vm_init.sh b/boot/appc_vm_init.sh index 8534a347..3e57c391 100644 --- a/boot/appc_vm_init.sh +++ b/boot/appc_vm_init.sh @@ -17,7 +17,7 @@ sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="$DMAAP_TOPIC"/g" docker-compose.ym docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO docker pull $NEXUS_DOCKER_REPO/onap/appc-image:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/appc-image:$DOCKER_IMAGE_VERSION openecomp/appc-image:latest +docker tag $NEXUS_DOCKER_REPO/onap/appc-image:$DOCKER_IMAGE_VERSION onap/appc-image:latest docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$DGBUILDER_IMAGE_VERSION docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$DGBUILDER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:latest diff --git a/boot/oof_install.sh b/boot/oof_install.sh index d4921371..f54d85b9 100644 --- a/boot/oof_install.sh +++ b/boot/oof_install.sh @@ -60,7 +60,7 @@ mv /opt/oof_serv.sh /etc/init.d update-rc.d oof_serv.sh defaults # Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | tee /etc/apt/sources.list.d/docker.list +echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list apt-get update apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-get install -y --allow-unauthenticated docker-engine @@ -89,6 +89,18 @@ service docker restart echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head resolvconf -u +# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes +if [[ $CLOUD_ENV != "rackspace" ]] +then + sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub + grub-mkconfig -o /boot/grub/grub.cfg + sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg + sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules + echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg + echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic + reboot +fi + # Clone Gerrit repository and run docker containers cd /opt ./oof_vm_init.sh
\ No newline at end of file diff --git a/boot/policy_vm_init.sh b/boot/policy_vm_init.sh index b6b7d1fc..3803a83d 100644 --- a/boot/policy_vm_init.sh +++ b/boot/policy_vm_init.sh @@ -66,12 +66,12 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO #docker tag $NEXUS_DOCKER_REPO/onap/policy-db:$DOCKER_IMAGE_VERSION onap/policy/policy-db:latest docker pull $NEXUS_DOCKER_REPO/onap/policy-pe:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/policy-pe:$DOCKER_IMAGE_VERSION onap/policy/policy-pe:latest +docker tag $NEXUS_DOCKER_REPO/onap/policy-pe:$DOCKER_IMAGE_VERSION onap/policy-pe:latest docker pull $NEXUS_DOCKER_REPO/onap/policy-drools:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/policy-drools:$DOCKER_IMAGE_VERSION onap/policy/policy-drools:latest +docker tag $NEXUS_DOCKER_REPO/onap/policy-drools:$DOCKER_IMAGE_VERSION onap/policy-drools:latest docker pull $NEXUS_DOCKER_REPO/onap/policy-nexus:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/policy-nexus:$DOCKER_IMAGE_VERSION onap/policy/policy-nexus:latest +docker tag $NEXUS_DOCKER_REPO/onap/policy-nexus:$DOCKER_IMAGE_VERSION onap/policy-nexus:latest /opt/docker/docker-compose up -d diff --git a/boot/vid_vm_init.sh b/boot/vid_vm_init.sh index 62e0f12d..9c67307f 100644 --- a/boot/vid_vm_init.sh +++ b/boot/vid_vm_init.sh @@ -11,11 +11,11 @@ cd /opt docker pull mariadb:10 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/openecomp/vid:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/vid:$DOCKER_IMAGE_VERSION docker rm -f vid-mariadb docker rm -f vid-server docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v /opt/vid/lf_config/vid-my.cnf:/etc/mysql/my.cnf -v /opt/vid/lf_config/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql -v /var/lib/mysql -d mariadb:10 -docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d $NEXUS_DOCKER_REPO/openecomp/vid:$DOCKER_IMAGE_VERSION +docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d $NEXUS_DOCKER_REPO/onap/vid:$DOCKER_IMAGE_VERSION diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index d8029424..a79a188d 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -138,7 +138,7 @@ parameters: appc_docker: 1.3.0-SNAPSHOT-latest so_docker: 1.2.1 dcae_docker: v1.1.1 - policy_docker: v1.1.1 + policy_docker: 1.2-SNAPSHOT-latest portal_docker: 2.1-STAGING-latest robot_docker: 1.2-STAGING-latest sdc_docker: 1.2-STAGING-latest diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index d9561625..98d850bb 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -1919,8 +1919,8 @@ resources: oof_vm: type: OS::Nova::Server properties: - image: { get_param: ubuntu_1404_image } - flavor: { get_param: flavor_medium } + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_large } name: str_replace: template: base-oof |