Merge "Remove controller and compute class groups."

data/class_groups/compute.yaml

@@ -1,4 +0,0 @@
-class_groups:
-  - nova_compute
-  - cinder_volume
-  - ceilometer_compute

data/class_groups/controller.yaml

@@ -1,14 +0,0 @@
-class_groups:
-  - glance_all
-  - keystone_all
-  - cinder_controller
-  - nova_controller
-  - horizon
-  - ceilometer_controller
-  - heat_all
-  - "%{db_type}_database"
-classes:
-  - "nova::%{rpc_type}"
-  - "%{network_service}"
-  - "%{network_service}::plugins::%{network_plugin}"
-  - "%{network_service}::server"

data/scenarios/2_role.yaml

@@ -15,7 +15,15 @@ roles:
     classes:
       - coe::base
     class_groups:
-      - controller
+      - glance_all
+      - keystone_all
+      - cinder_controller
+      - nova_controller
+      - horizon
+      - ceilometer_controller
+      - heat_all
+      - "%{db_type}_database"
+      - "nova::%{rpc_type}"
       - network_controller
       - test_file
   compute:
@@ -23,7 +31,9 @@ roles:
       - coe::base
       - cinder::setup_test_volume
     class_groups:
-      - compute
+      - nova_compute
+      - cinder_volume
+      - ceilometer_compute
   swift_proxy:
     classes:
       - coe::base

data/scenarios/3_role.yaml

@@ -1,10 +1,21 @@
 roles:
   controller:
     class_groups:
-      - controller
+      - glance_all
+      - keystone_all
+      - cinder_controller
+      - nova_controller
+      - horizon
+      - ceilometer_controller
+      - heat_all
+      - "%{db_type}_database"
+      - "nova::%{rpc_type}"
+      - network_controller
   compute:
     class_groups:
-      - compute
+      - nova_compute
+      - cinder_volume
+      - ceilometer_compute
   network_controller:
     class_groups:
       - network_controller

data/scenarios/all_in_one.yaml

@@ -10,8 +10,18 @@ roles:
       - openstack::swift::storage-node
     class_groups:
       - build
-      - controller
+      - glance_all
-      - compute
+      - keystone_all
+      - cinder_controller
+      - nova_controller
+      - horizon
+      - ceilometer_controller
+      - heat_all
+      - "%{db_type}_database"
+      - "nova::%{rpc_type}"
+      - nova_compute
+      - cinder_volume
+      - ceilometer_compute
       - network_controller
       - test_file
   compute:
@@ -19,4 +29,6 @@ roles:
       - coe::base
       - cinder::setup_test_volume
     class_groups:
-      - compute
+      - nova_compute
+      - cinder_volume
+      - ceilometer_compute

data/scenarios/full_ha.yaml

@@ -24,7 +24,18 @@ roles:
       - coe::network::interface
       - mongodb::replset
     class_groups:
-      - controller
+      - glance_all
+      - keystone_all
+      - cinder_controller
+      - nova_controller
+      - horizon
+      - ceilometer_controller
+      - heat_all
+      - "%{db_type}_database"
+      - "nova::%{rpc_type}"
+      - "%{network_service}"
+      - "%{network_service}::plugins::%{network_plugin}"
+      - "%{network_service}::server"
       - provider_network_controller
       - test_file
   load_balancer:
@@ -37,7 +48,9 @@ roles:
       - coe::network::interface
       - cinder::setup_test_volume
     class_groups:
-      - compute
+      - nova_compute
+      - cinder_volume
+      - ceilometer_compute
       - ceph_osd
   compute_without_osd:
     classes:

data/scenarios/swift.yaml

@@ -12,7 +12,18 @@ roles:
     classes:
       - coe::base
     class_groups:
-      - controller
+      - glance_all
+      - keystone_all
+      - cinder_controller
+      - nova_controller
+      - horizon
+      - ceilometer_controller
+      - heat_all
+      - "%{db_type}_database"
+      - "nova::%{rpc_type}"
+      - "%{network_service}"
+      - "%{network_service}::plugins::%{network_plugin}"
+      - "%{network_service}::server"
       - network_controller
       - test_file
   swift_proxy: