diff options
| -rw-r--r-- | boot/sdnc_vm_init.sh | 8 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.yaml | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/boot/sdnc_vm_init.sh b/boot/sdnc_vm_init.sh index 23feb331..ee4baf16 100644 --- a/boot/sdnc_vm_init.sh +++ b/boot/sdnc_vm_init.sh @@ -14,11 +14,11 @@ git pull cd /opt/sdnc/installation/src/main/yaml docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/openecomp/sdnc-image:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/openecomp/sdnc-image:$DOCKER_IMAGE_VERSION openecomp/sdnc-image:latest +docker pull $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_IMAGE_VERSION openecomp/sdnc-image:latest -docker pull $NEXUS_DOCKER_REPO/openecomp/admportal-sdnc-image:$DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/openecomp/admportal-sdnc-image:$DOCKER_IMAGE_VERSION openecomp/admportal-sdnc-image:latest +docker pull $NEXUS_DOCKER_REPO/onap/admportal-sdnc-image:$DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/admportal-sdnc-image:$DOCKER_IMAGE_VERSION openecomp/admportal-sdnc-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_float.yaml b/heat/ONAP/onap_openstack_float.yaml index 438be715..5ee7fb7e 100644 --- a/heat/ONAP/onap_openstack_float.yaml +++ b/heat/ONAP/onap_openstack_float.yaml @@ -44,6 +44,14 @@ parameters: type: string description: Public network for floating IP address allocation + public_subnet_id: + type: string + description: Public subnet for floating IP address allocation + + router_gateway_ip: + type: string + description: Router gateway IP address + ubuntu_1404_image: type: string description: Name of the Ubuntu 14.04 image @@ -1573,7 +1581,7 @@ resources: properties: floating_network_id: { get_param: public_net_id } port_id: { get_resource: openo_private_port } - floating_ip_address: { get_param: onap_float_ip } + floating_ip_address: { get_param: openo_float_ip } openo_vm: type: OS::Nova::Server |