From b233779b177d8eb6b0236e12e9024132f11f78c5 Mon Sep 17 00:00:00 2001
From: Michael Chapman <woppin@gmail.com>
Date: Thu, 6 Mar 2014 21:55:52 +1100
Subject: [PATCH] Remove controller and compute class groups.

These two class groups are composed from other class
groups. The forthcoming rewrite of the data model to
support pure hiera does not support this, and since
controller and compute are basically just restating
the role names and hiding what is actually on the node,
this patch removes them and places the set of groups
they were abstracting in their place.

Change-Id: Ice72703cbd5523e03876d09513e42c2c0ad050d7
---
 data/class_groups/compute.yaml    |  4 ----
 data/class_groups/controller.yaml | 14 --------------
 data/scenarios/2_role.yaml        | 14 ++++++++++++--
 data/scenarios/3_role.yaml        | 15 +++++++++++++--
 data/scenarios/all_in_one.yaml    | 18 +++++++++++++++---
 data/scenarios/full_ha.yaml       | 17 +++++++++++++++--
 data/scenarios/swift.yaml         | 13 ++++++++++++-
 7 files changed, 67 insertions(+), 28 deletions(-)
 delete mode 100644 data/class_groups/compute.yaml
 delete mode 100644 data/class_groups/controller.yaml

diff --git a/data/class_groups/compute.yaml b/data/class_groups/compute.yaml
deleted file mode 100644
index 25e290c..0000000
--- a/data/class_groups/compute.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-class_groups:
-  - nova_compute
-  - cinder_volume
-  - ceilometer_compute
diff --git a/data/class_groups/controller.yaml b/data/class_groups/controller.yaml
deleted file mode 100644
index cac20c8..0000000
--- a/data/class_groups/controller.yaml
+++ /dev/null
@@ -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"
diff --git a/data/scenarios/2_role.yaml b/data/scenarios/2_role.yaml
index 630b8a3..0ebb41f 100644
--- a/data/scenarios/2_role.yaml
+++ b/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
diff --git a/data/scenarios/3_role.yaml b/data/scenarios/3_role.yaml
index 1e4aea4..d9a72f8 100644
--- a/data/scenarios/3_role.yaml
+++ b/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
diff --git a/data/scenarios/all_in_one.yaml b/data/scenarios/all_in_one.yaml
index 8a22114..52cf91e 100644
--- a/data/scenarios/all_in_one.yaml
+++ b/data/scenarios/all_in_one.yaml
@@ -10,8 +10,18 @@ roles:
       - openstack::swift::storage-node
     class_groups:
       - build
-      - controller
-      - compute
+      - glance_all
+      - 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
diff --git a/data/scenarios/full_ha.yaml b/data/scenarios/full_ha.yaml
index f3e1f2c..dede079 100644
--- a/data/scenarios/full_ha.yaml
+++ b/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:
diff --git a/data/scenarios/swift.yaml b/data/scenarios/swift.yaml
index 5fc1062..6ae6141 100644
--- a/data/scenarios/swift.yaml
+++ b/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: