Merge "Remove controller and compute class groups."

This commit is contained in:
Jenkins
2014-04-01 13:07:52 +00:00
committed by Gerrit Code Review
7 changed files with 67 additions and 28 deletions

View File

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

View File

@@ -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"

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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:

View File

@@ -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: