Shrink unused subnets

manifest-generation/diego.yml

@@ -23,10 +23,10 @@ networks:
     subnets: (( iaas_settings.subnet_configs.diego1.subnets ))
   - name: diego2
     type: manual
-    subnets: (( iaas_settings.subnet_configs.diego2.subnets ))
+    subnets: (( iaas_settings.subnet_configs.diego2.subnets || [] ))
   - name: diego3
     type: manual
-    subnets: (( iaas_settings.subnet_configs.diego3.subnets ))
+    subnets: (( iaas_settings.subnet_configs.diego3.subnets || [] ))
 
 disk_pools:
   - name: database_disks
@@ -41,83 +41,83 @@ resource_pools:
   - name: access_z2
     network: diego2
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.access_z2.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.access_z2.cloud_properties || empty_hash ))
   - name: access_z3
     network: diego3
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.access_z3.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.access_z3.cloud_properties || empty_hash ))
   - name: brain_z1
     network: diego1
     stemcell: (( iaas_settings.stemcell ))
     cloud_properties: (( iaas_settings.resource_pool_cloud_properties.brain_z1.cloud_properties ))
   - name: brain_z2
     network: diego2
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.brain_z2.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.brain_z2.cloud_properties || empty_hash ))
   - name: brain_z3
     network: diego3
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.brain_z3.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.brain_z3.cloud_properties || empty_hash ))
   - name: cc_bridge_z1
     network: diego1
     stemcell: (( iaas_settings.stemcell ))
     cloud_properties: (( iaas_settings.resource_pool_cloud_properties.cc_bridge_z1.cloud_properties ))
   - name: cc_bridge_z2
     network: diego2
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.cc_bridge_z2.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.cc_bridge_z2.cloud_properties || empty_hash ))
   - name: cc_bridge_z3
     network: diego3
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.cc_bridge_z3.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.cc_bridge_z3.cloud_properties || empty_hash ))
   - name: cell_z1
     network: diego1
     stemcell: (( iaas_settings.stemcell ))
     cloud_properties: (( iaas_settings.resource_pool_cloud_properties.cell_z1.cloud_properties ))
   - name: cell_z2
     network: diego2
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.cell_z2.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.cell_z2.cloud_properties || empty_hash ))
   - name: cell_z3
     network: diego3
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.cell_z3.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.cell_z3.cloud_properties || empty_hash ))
   - name: database_z1
     network: diego1
     stemcell: (( iaas_settings.stemcell ))
     cloud_properties: (( iaas_settings.resource_pool_cloud_properties.database_z1.cloud_properties ))
   - name: database_z2
     network: diego2
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.database_z2.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.database_z2.cloud_properties || empty_hash ))
   - name: database_z3
     network: diego3
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.database_z3.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.database_z3.cloud_properties || empty_hash ))
   - name: route_emitter_z1
     network: diego1
     stemcell: (( iaas_settings.stemcell ))
     cloud_properties: (( iaas_settings.resource_pool_cloud_properties.route_emitter_z1.cloud_properties ))
   - name: route_emitter_z2
     network: diego2
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.route_emitter_z2.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.route_emitter_z2.cloud_properties || empty_hash ))
   - name: route_emitter_z3
     network: diego3
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.route_emitter_z3.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.route_emitter_z3.cloud_properties || empty_hash ))
   - name: colocated_z1
     network: diego1
     stemcell: (( iaas_settings.stemcell ))
     cloud_properties: (( iaas_settings.resource_pool_cloud_properties.colocated_z1.cloud_properties ))
   - name: colocated_z2
     network: diego2
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.colocated_z2.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.colocated_z2.cloud_properties || empty_hash ))
   - name: colocated_z3
     network: diego3
     stemcell: (( iaas_settings.stemcell ))
-    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.colocated_z3.cloud_properties ))
+    cloud_properties: (( iaas_settings.resource_pool_cloud_properties.colocated_z3.cloud_properties || empty_hash ))
 
 jobs:
   - name: database_z1

manifest-generation/examples/openstack/iaas-settings.yml

@@ -8,67 +8,69 @@ iaas_settings:
     - name: access_z1
       cloud_properties:
         instance_type: m1.small
-    - name: access_z2
+    - name: brain_z1
       cloud_properties:
         instance_type: m1.small
-    - name: access_z3
+    - name: cc_bridge_z1
       cloud_properties:
         instance_type: m1.small
-    - name: brain_z1
+    - name: cell_z1
       cloud_properties:
-        instance_type: m1.small
-    - name: brain_z2
+        instance_type: m1.large
+    - name: colocated_z1
+      cloud_properties:
+        instance_type: m1.large
+    - name: database_z1
       cloud_properties:
         instance_type: m1.small
-    - name: brain_z3
+    - name: route_emitter_z1
       cloud_properties:
         instance_type: m1.small
-    - name: cc_bridge_z1
+    - name: errand
       cloud_properties:
         instance_type: m1.small
-    - name: cc_bridge_z2
+# z2 & z3 are used for high-available deployments
+# You can safely remove them if you run a single-zone deployment
+    - name: access_z2
       cloud_properties:
         instance_type: m1.small
-    - name: cc_bridge_z3
+    - name: brain_z2
       cloud_properties:
         instance_type: m1.small
-    - name: cell_z1
+    - name: cc_bridge_z2
       cloud_properties:
-        instance_type: m1.large
+        instance_type: m1.small
     - name: cell_z2
       cloud_properties:
         instance_type: m1.large
-    - name: cell_z3
-      cloud_properties:
-        instance_type: m1.large
-    - name: colocated_z1
-      cloud_properties:
-        instance_type: m1.large
     - name: colocated_z2
       cloud_properties:
         instance_type: m1.large
-    - name: colocated_z3
-      cloud_properties:
-        instance_type: m1.large
-    - name: database_z1
+    - name: database_z2
       cloud_properties:
         instance_type: m1.small
-    - name: database_z2
+    - name: route_emitter_z2
       cloud_properties:
         instance_type: m1.small
-    - name: database_z3
+    - name: access_z3
       cloud_properties:
         instance_type: m1.small
-    - name: route_emitter_z1
+    - name: brain_z3
       cloud_properties:
         instance_type: m1.small
-    - name: route_emitter_z2
+    - name: cc_bridge_z3
       cloud_properties:
         instance_type: m1.small
-    - name: route_emitter_z3
+    - name: cell_z3
+      cloud_properties:
+        instance_type: m1.large
+    - name: colocated_z3
+      cloud_properties:
+        instance_type: m1.large
+    - name: database_z3
       cloud_properties:
         instance_type: m1.small
-    - name: errand
+    - name: route_emitter_z3
       cloud_properties:
         instance_type: m1.small
 
@@ -84,6 +86,9 @@ iaas_settings:
           security_groups:
           - bosh
           - cf-private
+
+# Diego2 & diego3 subnets are used for high-available deployments
+# They can be safely removed if you run a single-zone deployment
     - name: diego2
       type: manual
       subnets: