Consolidate vFW Heat template

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

diff --git a/heat/vFW/base_vfw_openstack.yaml b/heat/vFW/base_vfw.yaml
similarity index 96%
rename from heat/vFW/base_vfw_openstack.yaml
rename to heat/vFW/base_vfw.yaml
index 4900c55..77b53a8 100644 (file)
--- a/heat/vFW/base_vfw_openstack.yaml
+++ b/heat/vFW/base_vfw.yaml
@@ -208,16 +208,13 @@ resources:
   vfw_private_0_port:\r
     type: OS::Neutron::Port\r
     properties:\r
-      security_groups: []\r
-      port_security_enabled: False\r
       network: { get_resource: unprotected_private_network }\r
       fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]\r
 \r
   vfw_private_1_port:\r
     type: OS::Neutron::Port\r
     properties:\r
-      security_groups: []\r
-      port_security_enabled: False\r
+      allowed_address_pairs: [{ "ip_address": { get_param: vpg_private_ip_0 }}]\r
       network: { get_resource: protected_private_network }\r
       fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]\r
 \r