Merge pull request #961 from claco/v4.2.3rc

Move cinder scheduler to where volume is located
rcbops · Jun 13, 2014 · 506ac35 · 506ac35
2 parents 0071bfc + aeae97b
commit 506ac35
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/roles/cinder-volume.rb b/roles/cinder-volume.rb
@@ -2,6 +2,7 @@
 description "Cinder Volume Service"
 run_list(
   "role[base]",
+  "role[cinder-scheduler]",
   "recipe[cinder::cinder-volume]",
   "recipe[openstack-monitoring::cinder-volume]"
 )
diff --git a/roles/ha-controller1.rb b/roles/ha-controller1.rb
@@ -22,7 +22,6 @@
   "role[nova-api-os-compute]",
   "role[cinder-setup]",
   "role[cinder-api]",
-  "role[cinder-scheduler]",
   "role[ceilometer-setup]",
   "role[ceilometer-api]",
   "role[ceilometer-collector]",

diff --git a/roles/ha-controller2.rb b/roles/ha-controller2.rb
@@ -18,7 +18,6 @@
   "role[nova-api-os-compute]",
   "role[nova-network-controller]",
   "role[cinder-api]",
-  "role[cinder-scheduler]",
   "role[ceilometer-api]",
   "role[ceilometer-collector]",
   "role[ceilometer-central-agent]",