diff options
| -rw-r--r-- | boot/aai_vm_init.sh | 2 | ||||
| -rw-r--r-- | heat/OpenECOMP/onap_openstack_float.env | 4 | ||||
| -rw-r--r-- | heat/OpenECOMP/onap_openstack_float.yaml | 13 |
3 files changed, 17 insertions, 2 deletions
diff --git a/boot/aai_vm_init.sh b/boot/aai_vm_init.sh index dfbaa5fa..6fcf7b0e 100644 --- a/boot/aai_vm_init.sh +++ b/boot/aai_vm_init.sh @@ -10,7 +10,7 @@ DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO docker pull $NEXUS_DOCKER_REPO/aaidocker/aai-hbase-1.2.3 docker rm -f hbase-1.2.3 -docker run -d --net=host --name="hbase-1.2.3" aaidocker/aai-hbase-1.2.3 +docker run -d --net=host --name="hbase-1.2.3" $NEXUS_DOCKER_REPO/aaidocker/aai-hbase-1.2.3 # Wait 3 minutes before instantiating the A&AI container sleep 180 diff --git a/heat/OpenECOMP/onap_openstack_float.env b/heat/OpenECOMP/onap_openstack_float.env index aed3a4bd..4c2fbeed 100644 --- a/heat/OpenECOMP/onap_openstack_float.env +++ b/heat/OpenECOMP/onap_openstack_float.env @@ -8,6 +8,10 @@ parameters: public_net_id: PUT YOUR NETWORK ID/NAME HERE + public_subnet_id: PUT PUBLIC SUBNET ID HERE + + router_gateway_ip: PUT ROUTER GATEWAY PUBLIC IP HERE + ubuntu_1404_image: PUT THE UBUNTU 14.04 IMAGE NAME HERE ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml index 02feac7a..eff4cc8e 100644 --- a/heat/OpenECOMP/onap_openstack_float.yaml +++ b/heat/OpenECOMP/onap_openstack_float.yaml @@ -39,11 +39,19 @@ parameters: # Parameters used across all ONAP components # # # ############################################## - + public_net_id: type: string description: Public network for floating IP address allocation + public_subnet_id: + type: string + description: Public network subnet id + + router_gateway_ip: + type: string + description: Public network gateway IP address + ubuntu_1404_image: type: string description: Name of the Ubuntu 14.04 image @@ -399,6 +407,9 @@ resources: properties: external_gateway_info: network: { get_param: public_net_id } + external_fixed_ips: + - ip_address: { get_param: router_gateway_ip } + subnet: { get_param: public_subnet_id } router_interface: type: OS::Neutron::RouterInterface |