Assign public interface to vFW in OpenStack

[demo.git] / heat / vFW / base_vfw_openstack.yaml

diff --git a/heat/vFW/base_vfw_openstack.yaml b/heat/vFW/base_vfw_openstack.yaml
index 6ef33cc..9a18672 100644 (file)
--- a/heat/vFW/base_vfw_openstack.yaml
+++ b/heat/vFW/base_vfw_openstack.yaml
@@ -227,12 +227,6 @@ resources:
       network: { get_param: onap_private_net_id }\r
       fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_2 }}]\r
 \r
-  vfw_floating_ip:\r
-    type: OS::Neutron::FloatingIP\r
-    properties:\r
-      floating_network_id: { get_param: public_net_id }\r
-      port_id: { get_resource: vfw_private_2_port }\r
-\r
   vfw_0:\r
     type: OS::Nova::Server\r
     properties:\r
@@ -241,9 +235,10 @@ resources:
       name: { get_param: vfw_name_0 }\r
       key_name: { get_resource: my_keypair }\r
       networks:\r
-        - port: { get_resource: vfw_private_2_port }\r
+        - network: { get_param: public_net_id }\r
         - port: { get_resource: vfw_private_0_port }\r
         - port: { get_resource: vfw_private_1_port }\r
+        - port: { get_resource: vfw_private_2_port }\r
       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\r
       user_data_format: RAW\r
       user_data:\r
@@ -257,6 +252,7 @@ resources:
             __install_script_version__ : { get_param: install_script_version }\r
             __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 }\r
             __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }\r
+            __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }\r
             __cloud_env__ : { get_param: cloud_env }\r
           template: |\r
             #!/bin/bash\r
@@ -271,6 +267,7 @@ resources:
             echo "__install_script_version__" > /opt/config/install_script_version.txt\r
             echo "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt\r
             echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt\r
+            echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt\r
             echo "__cloud_env__" > /opt/config/cloud_env.txt\r
             \r
             # Download and run install script\r
@@ -281,12 +278,6 @@ resources:
 \r
 \r
   # Virtual Packet Generator instantiation\r
-  vpg_floating_ip:\r
-    type: OS::Neutron::FloatingIP\r
-    properties:\r
-      floating_network_id: { get_param: public_net_id }\r
-      port_id: { get_resource: vpg_private_1_port }\r
-\r
   vpg_private_0_port:\r
     type: OS::Neutron::Port\r
     properties:\r
@@ -307,8 +298,9 @@ resources:
       name: { get_param: vpg_name_0 }\r
       key_name: { get_resource: my_keypair }\r
       networks:\r
-        - port: { get_resource: vpg_private_1_port }\r
+        - network: { get_param: public_net_id }\r
         - port: { get_resource: vpg_private_0_port }\r
+        - port: { get_resource: vpg_private_1_port }\r
       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\r
       user_data_format: RAW\r
       user_data:\r
@@ -322,6 +314,7 @@ resources:
             __demo_artifacts_version__ : { get_param: demo_artifacts_version }\r
             __install_script_version__ : { get_param: install_script_version }\r
             __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 }\r
+            __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }\r
             __cloud_env__ : { get_param: cloud_env }\r
           template: |\r
             #!/bin/bash\r
@@ -336,6 +329,7 @@ resources:
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt\r
             echo "__install_script_version__" > /opt/config/install_script_version.txt\r
             echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt\r
+            echo "__vpg_private_ip_1__" > /opt/config/vpg_private_ip_1.txt\r
             echo "__cloud_env__" > /opt/config/cloud_env.txt\r
             \r
             # Download and run install script\r
@@ -358,12 +352,6 @@ resources:
       network: { get_param: onap_private_net_id }\r
       fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vsn_private_ip_1 }}]\r
 \r
-  vsn_floating_ip:\r
-    type: OS::Neutron::FloatingIP\r
-    properties:\r
-      floating_network_id: { get_param: public_net_id }\r
-      port_id: { get_resource: vsn_private_1_port }\r
-\r
   vsn_0:\r
     type: OS::Nova::Server\r
     properties:\r
@@ -372,8 +360,9 @@ resources:
       name: { get_param: vsn_name_0 }\r
       key_name: { get_resource: my_keypair }\r
       networks:\r
-        - port: { get_resource: vsn_private_1_port }\r
+        - network: { get_param: public_net_id }\r
         - port: { get_resource: vsn_private_0_port }\r
+        - port: { get_resource: vsn_private_1_port }\r
       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\r
       user_data_format: RAW\r
       user_data:\r
@@ -385,6 +374,7 @@ resources:
             __repo_url_artifacts__ : { get_param: repo_url_artifacts }\r
             __install_script_version__ : { get_param: install_script_version }\r
             __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }\r
+            __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }\r
             __cloud_env__ : { get_param: cloud_env }\r
           template: |\r
             #!/bin/bash\r
@@ -396,6 +386,7 @@ resources:
             echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\r
             echo "__install_script_version__" > /opt/config/install_script_version.txt\r
             echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt\r
+            echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt\r
             echo "__cloud_env__" > /opt/config/cloud_env.txt\r
             \r
             # Download and run install script\r