diff options
| -rwxr-xr-x | boot/portal_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_float.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.yaml | 4 |
9 files changed, 23 insertions, 2 deletions
diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh index 5b201e09..c58f22f0 100755 --- a/boot/portal_vm_init.sh +++ b/boot/portal_vm_init.sh @@ -10,6 +10,7 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +CLI_DOCKER_VERSION=$(cat /opt/config/cli_docker_version.txt) # Refresh configuration and scripts cd /opt/portal @@ -30,14 +31,14 @@ docker pull $NEXUS_DOCKER_REPO/openecomp/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION docker pull $NEXUS_DOCKER_REPO/openecomp/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION docker pull $NEXUS_DOCKER_REPO/openecomp/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION # Add CLI docker image -docker pull $NEXUS_DOCKER_REPO/onap/cli:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/onap/cli:$CLI_DOCKER_VERSION # Tag them as expected by docker-compose file docker tag $NEXUS_DOCKER_REPO/openecomp/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG docker tag $NEXUS_DOCKER_REPO/openecomp/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG docker tag $NEXUS_DOCKER_REPO/openecomp/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG # Add tagging for CLI docker image as expected by docker-compose file -docker tag $NEXUS_DOCKER_REPO/onap/cli:$DOCKER_IMAGE_VERSION onap/cli:$PORTAL_TAG +docker tag $NEXUS_DOCKER_REPO/onap/cli:$CLI_DOCKER_VERSION onap/cli:$PORTAL_TAG # docker-compose is not in /usr/bin /opt/docker/docker-compose down diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 3576ef7f..f199cba5 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -162,6 +162,7 @@ parameters: vfc_docker: latest uui_docker: latest dgbuilder_docker: 0.1-STAGING-latest + cli_docker: 1.1-STAGING-latest ##################### # # diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index c0e8c8f2..21accaa5 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -333,6 +333,8 @@ parameters: type: string dgbuilder_docker: type: string + cli_docker: + type: string aai_branch: type: string @@ -1155,6 +1157,7 @@ resources: __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] } __docker_version__: { get_param: portal_docker } __gerrit_branch__: { get_param: portal_branch } + __cli_docker__: { get_param: cli_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __portal_repo__: { get_param: portal_repo } @@ -1172,6 +1175,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__cli_docker__" > /opt/config/cli_docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__portal_repo__" > /opt/config/remote_repo.txt diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env index 0a3e8e61..976805a2 100644 --- a/heat/ONAP/onap_openstack_float.env +++ b/heat/ONAP/onap_openstack_float.env @@ -183,6 +183,7 @@ parameters: vfc_docker: latest uui_docker: latest dgbuilder_docker: 0.1-STAGING-latest + cli_docker: 1.1-STAGING-latest ##################### # # diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml index edb26397..010d44cd 100644 --- a/heat/ONAP/onap_openstack_float.yaml +++ b/heat/ONAP/onap_openstack_float.yaml @@ -376,6 +376,8 @@ parameters: type: string dgbuilder_docker: type: string + cli_docker: + type: string aai_branch: type: string @@ -1212,6 +1214,7 @@ resources: __docker_version__: { get_param: portal_docker } __gerrit_branch__: { get_param: portal_branch } __cloud_env__: { get_param: cloud_env } + __cli_docker__: { get_param: cli_docker } __external_dns__: { get_param: external_dns } __portal_repo__: { get_param: portal_repo } template: | @@ -1228,6 +1231,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__cli_docker__" > /opt/config/cli_docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__portal_repo__" > /opt/config/remote_repo.txt diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env index aa206c96..6bf5e806 100644 --- a/heat/ONAP/onap_openstack_nofloat.env +++ b/heat/ONAP/onap_openstack_nofloat.env @@ -155,6 +155,7 @@ parameters: vfc_docker: latest uui_docker: latest dgbuilder_docker: 0.1-STAGING-latest + cli_docker: 1.1-STAGING-latest ##################### # # diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml index 054e7c6b..f48a80b5 100644 --- a/heat/ONAP/onap_openstack_nofloat.yaml +++ b/heat/ONAP/onap_openstack_nofloat.yaml @@ -320,6 +320,8 @@ parameters: type: string dgbuilder_docker: type: string + cli_docker: + type: string aai_branch: type: string @@ -1111,6 +1113,7 @@ resources: __docker_version__: { get_param: portal_docker } __gerrit_branch__: { get_param: portal_branch } __cloud_env__: { get_param: cloud_env } + __cli_docker__: { get_param: cli_docker } __external_dns__: { get_param: external_dns } __portal_repo__: { get_param: portal_repo } template: | @@ -1128,6 +1131,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__cli_docker__" > /opt/config/cli_docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__portal_repo__" > /opt/config/remote_repo.txt diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env index ad5ffae1..82e31eff 100644 --- a/heat/ONAP/onap_rackspace.env +++ b/heat/ONAP/onap_rackspace.env @@ -103,3 +103,4 @@ parameters: vid_docker: 1.1-STAGING-latest clamp_docker: 1.1-STAGING-latest dgbuilder_docker: 0.1-STAGING-latest + cli_docker: 1.1-STAGING-latest diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml index 52827a48..ab565550 100644 --- a/heat/ONAP/onap_rackspace.yaml +++ b/heat/ONAP/onap_rackspace.yaml @@ -203,6 +203,8 @@ parameters: type: string dgbuilder_docker: type: string + cli_docker: + type: string aai_branch: type: string @@ -903,6 +905,7 @@ resources: __docker_version__: { get_param: portal_docker } __gerrit_branch__: { get_param: portal_branch } __cloud_env__: { get_param: cloud_env } + __cli_docker__: { get_param: cli_docker } __portal_repo__: { get_param: portal_repo } template: | #!/bin/bash @@ -917,6 +920,7 @@ resources: echo "10.0.0.1" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__cli_docker__" > /opt/config/cli_docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__portal_repo__" > /opt/config/remote_repo.txt |