diff options
| -rw-r--r-- | heat/ONAP/cloud-config/appc_vm_init.sh | 5 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/heat/ONAP/cloud-config/appc_vm_init.sh b/heat/ONAP/cloud-config/appc_vm_init.sh index 647e9597..8c14398b 100644 --- a/heat/ONAP/cloud-config/appc_vm_init.sh +++ b/heat/ONAP/cloud-config/appc_vm_init.sh @@ -5,6 +5,7 @@ NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) export NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +ANSIBLE_DOCKER_IMAGE_VERSION=$(cat /opt/config/ansible_version.txt) DGBUILDER_IMAGE_VERSION=$(cat /opt/config/dgbuilder_version.txt) export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) @@ -19,6 +20,10 @@ 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 onap/appc-image:latest + +docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-ansible-server-image:$ANSIBLE_DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-ansible-server-image:$ANSIBLE_DOCKER_IMAGE_VERSION onap/ccsdk-ansible-server-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/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index d9040e74..96359bf9 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -141,6 +141,7 @@ parameters: esr_docker: "1.1.0" sdc_wfd_docker: "1.1.0" dgbuilder_docker: "0.3-STAGING-latest" + ansible_docker: "0.3.0" cli_docker: "2.0.2" music_docker: "2.5.3" cassandra_music_docker: "3.0.0" diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 18ac6d62..e2dc3abd 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -409,6 +409,8 @@ parameters: type: string dgbuilder_docker: type: string + ansible_docker: + type: string cli_docker: type: string music_docker: @@ -1756,6 +1758,7 @@ resources: __docker_version__: { get_param: appc_docker } __gerrit_branch__: { get_param: appc_branch } __dgbuilder_docker__: { get_param: dgbuilder_docker } + __ansible_docker__: { get_param: ansible_docker } __appc_repo__: { get_param: appc_repo } template: | #!/bin/bash @@ -1765,6 +1768,7 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt + echo "__ansible_docker__" > /opt/config/ansible_version.txt echo "__appc_repo__" > /opt/config/remote_repo.txt cd /opt diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index d04c3d4f..2916c34b 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -141,6 +141,7 @@ parameters: esr_docker: "${ESR_SERVER_DOCKER}" sdc_wfd_docker: "${SDC_WORKFLOW_DESIGNER_DOCKER}" dgbuilder_docker: "${CCSDK_DGBUILDER_IMAGE_DOCKER}" + ansible_docker: "${CCSDK_ANSIBLE_IMAGE_DOCKER}" cli_docker: "${CLI_DOCKER}" music_docker: "${MUSIC_DOCKER}" cassandra_music_docker: "${CASSANDRA_MUSIC_DOCKER}" |