Add Public IP for AAF

[demo.git] / heat / ONAP / onap_openstack.yaml

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index e986653..2053c9d 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -459,6 +459,8 @@ parameters:
   dbcl_docker:
     type: string
 
+  vfc_db_docker:
+    type: string
   vfc_nokia_docker:
     type: string
   vfc_nokiav2_docker:
@@ -1243,6 +1245,7 @@ resources:
               __vm_flavor__: { get_param: flavor_medium }
               __public_net_id__: { get_param: public_net_id }
               __oam_network_id__: { get_resource: oam_onap }
+              __sec_group__: { get_resource: onap_sg }
               __script_version__: { get_param: artifacts_version }
               __docker_version__: { get_param: robot_docker }
               __sniro_docker_version__: { get_param: sniro_docker }
@@ -1297,6 +1300,7 @@ resources:
                 echo "__public_net_id__" > /opt/config/public_net_id.txt
               fi
               echo "__oam_network_id__" > /opt/config/oam_network_id.txt
+              echo "__sec_group__" > /opt/config/sec_group.txt
               echo "__use_oam_net_for_robot__" > /opt/config/use_oam_net_for_robot.txt
               echo "__vnf_pub_key__" > /opt/config/vnf_pub_key.txt
               echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot
@@ -1951,6 +1955,7 @@ resources:
               __uui_docker__: { get_param: uui_docker }
               __esr_docker__: { get_param: esr_docker }
               __vnfsdk_repo__: { get_param: vnfsdk_repo }
+              __vfc_db_docker__: { get_param: vfc_db_docker }
               __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
               __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
               __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
@@ -1981,6 +1986,7 @@ resources:
               echo "__esr_docker__" > /opt/config/esr_docker.txt
               echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
 
+              echo "export DB_DOCKER_VER=__vfc_db_docker__" >> /opt/config/vfc_docker.txt
               echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
               echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
               echo "export MULTIVIMPROXY_DOCKER_VER=__vfc_multivimproxy_docker__" >> /opt/config/vfc_docker.txt
@@ -2453,6 +2459,7 @@ resources:
               __docker_version__: { get_param: aaf_docker }
               __aaf_repo__: { get_param: aaf_repo }
               __gerrit_branch__: { get_param: aaf_branch }
+              __public_ip__: { get_attr: [aaf_floating_ip, floating_ip_address] }
               __local_ip__: { get_param: aaf_ip_addr }
             template: |
               #!/bin/bash
@@ -2461,6 +2468,7 @@ resources:
               echo "__docker_version__" > /opt/config/docker_version.txt
               echo "__aaf_repo__" > /opt/config/remote_repo.txt
               echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__public_ip__" > /opt/config/public_ip.txt
               echo "__local_ip__" > /opt/config/local_ip.txt
 
               cd /opt