Update pv176-lab-2.json

Openstack/JSON/pv176-lab-2.json

@@ -27,15 +27,11 @@
         }
     },
     "resources":{
-        "PV176-Network":{
-            "type": "Lib::private_network",
-            "description": "Private network,subnet and router"
-        },
+        
 
 
         "PV176-Servers-ports": {
             "type": "OS::Heat::ResourceGroup",
-            "depends_on": ["PV176-Network"],
             "description": "Lab servers ports",
             "properties":{
                 "count": { "get_param": "lab_size" },
@@ -43,16 +39,13 @@
                     "type": "Lib::server_port",
                     "properties": { 
                         "name": "PV176-2-port-%index%",
-                        "network":{
-                            "get_attr": ["PV176-Network","network_subnet"]
-                            }
+                        "network":"PV176-private-network"
                     }
                 }
             }
         },
         "PV176-Servers-public-ports": {
             "type": "OS::Heat::ResourceGroup",
-            "depends_on": ["PV176-Network"],
             "description": "Lab servers public ports",
             "properties":{
                 "count": { "get_param": "lab_size" },
@@ -61,16 +54,13 @@
                     "properties": { 
                         "name": "PV176-public-2-port-%index%",
                         "port_subnet": "PV176-public-subnet",
-                        "network":{
-                            "get_attr": ["PV176-Network","public_network_subnet"]
-                            }
+                        "network":"PV176-public-network"
                     }
                 }
             }
         },
         "PV176-Desktops-ports": {
             "type": "OS::Heat::ResourceGroup",
-            "depends_on": ["PV176-Network"],
             "description": "Lab desktops ports",
             "properties":{
                 "count": { "get_param": "lab_size_desktop" },
@@ -78,16 +68,13 @@
                     "type": "Lib::server_port",
                     "properties": { 
                         "name": "PV176-2-port-desktop-%index%",
-                        "network":{
-                            "get_attr": ["PV176-Network","network_subnet"]
-                            }
+                        "network":"PV176-private-network"
                     }
                 }
             }
         },
         "PV176-Desktops-public-ports": {
             "type": "OS::Heat::ResourceGroup",
-            "depends_on": ["PV176-Network"],
             "description": "Lab desktops public ports",
             "properties":{
                 "count": { "get_param": "lab_size_desktop" },
@@ -96,9 +83,7 @@
                     "properties": { 
                         "name": "PV176-public-2-port-desktop-%index%",
                         "port_subnet": "PV176-public-subnet",
-                        "network":{
-                            "get_attr": ["PV176-Network","public_network_subnet"]
-                            }
+                        "network":"PV176-public-network"
                     }
                 }
             }
@@ -106,7 +91,7 @@
         "PV176-Servers":{
             "type": "OS::Heat::ResourceGroup",
             "description": "Lab servers",
-            "depends_on": ["PV176-Servers-ports","PV176-Servers-public-ports","PV176-Network"],
+            "depends_on": ["PV176-Servers-ports","PV176-Servers-public-ports"],
             "properties":{
                 "count": { "get_param": "lab_size" },
                 "resource_def":{
@@ -145,10 +130,7 @@
         }
     },
     "outputs":{
-        "PV176-network":{
-            "value":{ "get_attr": ["PV176-Network"] },
-            "description": "Private network information"
-        },
+        
         "PV176-ports":{
             "value": {"get_attr": ["PV176-Servers-ports","vm_port"]},
             "description": "Servers ports connected to private network"