Add security group to vFW, vLB

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

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 2eaaf73..bdd505c 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -304,8 +304,6 @@ parameters:
     type: string
   portal_repo:
     type: string
-  robot_repo:
-    type: string
   sdc_repo:
     type: string
   sdnc_repo:
@@ -508,8 +506,6 @@ parameters:
     type: string
   portal_branch:
     type: string
-  robot_branch:
-    type: string
   sdc_branch:
     type: string
   sdnc_branch:
@@ -583,7 +579,10 @@ resources:
         - protocol: tcp
           port_range_min: 1
           port_range_max: 65535
-
+        # Protocols used for vLB/vDNS use case
+        - protocol: 47
+        - protocol: 53
+        - protocol: 132
 
 
   # ONAP management private network
@@ -639,7 +638,7 @@ resources:
   dns_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_small }
       name:
         str_replace:
@@ -755,7 +754,7 @@ resources:
     type: OS::Nova::Server
     depends_on: aai2_vm
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_xlarge }
       name:
         str_replace:
@@ -842,7 +841,7 @@ resources:
   aai2_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_xlarge }
       name:
         str_replace:
@@ -1029,7 +1028,7 @@ resources:
   mrouter_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace:
@@ -1141,7 +1140,6 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __openstack_region__: { get_param: openstack_region }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __gerrit_branch__: { get_param: robot_branch }
             __cloud_env__: { get_param: cloud_env }
             __keystone_url__: { get_param: keystone_url }
             __aai1_ip_addr__: { get_param: aai1_ip_addr }
@@ -1173,7 +1171,6 @@ resources:
             __public_net_id__: { get_param: public_net_id }
             __oam_network_id__: { get_resource: oam_onap }
             __script_version__: { get_param: artifacts_version }
-            __robot_repo__: { get_param: robot_repo }
             __docker_version__: { get_param: robot_docker }
             __sniro_docker_version__: { get_param: sniro_docker }
             __vnf_pub_key__: { get_param: pub_key }
@@ -1196,7 +1193,6 @@ resources:
             echo "__docker_version__" > /opt/config/docker_version.txt
             echo "__sniro_docker_version__" > /opt/config/sniro_docker_version.txt
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             echo "__keystone_url__" > /opt/config/keystone.txt
             echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
             echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
@@ -1206,6 +1202,7 @@ resources:
             echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
             echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
             echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
+            echo "__policy_ip_addr__" > /opt/config/policy_healthcheck_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/cli_ip_addr.txt
             echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
@@ -1213,12 +1210,15 @@ resources:
             echo "__sdc_be_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
             echo "__sdc_be_onboard_ip_addr__" > /opt/config/sdc_be_onboard_ip_addr.txt
             echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
+            echo "__sdnc_ip_addr__" > /opt/config/sdnc_portal_ip_addr.txt
             echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
             echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
             echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
             echo "__openo_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt
             echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
             echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
+            echo "__oof_ip_addr__" > /opt/config/oof_homing_ip_addr.txt
+            echo "__oof_ip_addr__" > /opt/config/oof_sniro_ip_addr.txt
             echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
             echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
@@ -1236,7 +1236,6 @@ resources:
             echo "__oam_network_id__" > /opt/config/oam_network_id.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 "__robot_repo__" > /opt/config/remote_repo.txt
             echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot
             echo "localhost" > /opt/config/log_logstash_ip_addr.txt # these tests will be skipped by robot
             echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot
@@ -1282,7 +1281,7 @@ resources:
   vid_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_medium }
       name:
         str_replace:
@@ -1367,7 +1366,7 @@ resources:
   sdnc_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace:
@@ -1556,7 +1555,7 @@ resources:
   portal_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace:
@@ -1644,7 +1643,7 @@ resources:
   policy_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_xlarge }
       name:
         str_replace:
@@ -1731,7 +1730,7 @@ resources:
   appc_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace:
@@ -2308,7 +2307,7 @@ resources:
   music_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace: