Take out private networks from vCPE Heat templates

[demo.git] / heat / vCPE / vgmux / base_vcpe_vgmux.yaml

diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
similarity index 89%
rename from heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml
rename to heat/vCPE/vgmux/base_vcpe_vgmux.yaml
index 6cbaef1..4f12c64 100644 (file)
--- a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
@@ -24,7 +24,7 @@
 
 heat_template_version: 2013-05-23
 
-description: Heat template to deploy vCPE Infrastructue Metro vGMUX for ONAP
+description: Heat template to deploy vCPE Infrastructue Metro vGMUX
 
 ##############
 #            #
@@ -49,14 +49,22 @@ parameters:
     type: string
     label: vBNG vGMUX private network name or ID
     description: Private network that connects vBNG to vGMUX
+  bng_gmux_private_subnet_id:
+    type: string
+    label: vBNG vGMUX private sub-network name or ID
+    description: vBNG vGMUX private sub-network name or ID
   bng_gmux_private_net_cidr:
     type: string
     label: vBNG vGMUX private network CIDR
     description: The CIDR of the vBNG-vGMUX private network
   mux_gw_private_net_id:
     type: string
-    label: vCPE Public network name or ID
+    label: vGMUX vGWs network name or ID
     description: Private network that connects vGMUX to vGWs
+  mux_gw_private_subnet_id:
+    type: string
+    label: vGMUX vGWs sub-network name or ID
+    description: vGMUX vGWs sub-network name or ID
   mux_gw_private_net_cidr:
     type: string
     label: vGMUX private network CIDR
@@ -183,36 +191,13 @@ resources:
       public_key: { get_param: pub_key }
       save_private_key: false
 
-  mux_gw_private_network:
-    type: OS::Neutron::Net
-    properties:
-      name: { get_param: mux_gw_private_net_id }
-
-  mux_gw_private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name: { get_param: mux_gw_private_net_id }
-      network_id: { get_resource: mux_gw_private_network }
-      cidr: { get_param: mux_gw_private_net_cidr }
-      
-  bng_gmux_private_network:
-    type: OS::Neutron::Net
-    properties:
-      name: { get_param: bng_gmux_private_net_id }
-
-  bng_gmux_private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name: { get_param: bng_gmux_private_net_id }
-      network_id: { get_resource: bng_gmux_private_network }
-      cidr: { get_param: bng_gmux_private_net_cidr }
 
   # Virtual GMUX Instantiation
   vgmux_private_0_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: bng_gmux_private_network }
-      fixed_ips: [{"subnet": { get_resource: bng_gmux_private_subnet }, "ip_address": { get_param: vgmux_private_ip_0 }}]
+      network: { get_param: bng_gmux_private_net_id }
+      fixed_ips: [{"subnet": { get_param: bng_gmux_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_0 }}]
 
   vgmux_private_1_port:
     type: OS::Neutron::Port
@@ -223,8 +208,8 @@ resources:
   vgmux_private_2_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: mux_gw_private_network }
-      fixed_ips: [{"subnet": {  get_resource: mux_gw_private_subnet }, "ip_address": { get_param: vgmux_private_ip_2 }}]
+      network: { get_param: mux_gw_private_net_id }
+      fixed_ips: [{"subnet": {  get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_2 }}]
 
   vgmux_0:
     type: OS::Nova::Server
@@ -288,4 +273,3 @@ resources:
             cd /opt
             chmod +x v_gmux_install.sh
             ./v_gmux_install.sh
-