From aeae97b7e7be741022c43895eaa3da9bdf66a7b2 Mon Sep 17 00:00:00 2001
From: "Christopher H. Laco" <claco@chrislaco.com>
Date: Fri, 13 Jun 2014 17:35:22 -0400
Subject: [PATCH] Move cinder scheduler to where volume is located

HA failover causes cinder-volume to stop responding because the
scheduler does not reconnect properly after the vip failover. Since the
scheduler is worthless w/o the volume service anyways, just put it right
there  where the volume is and off of the ha controller 1/2 nodes.

Issue rcbops/chef-cookbooks#942

(cherry picked from commit 74bb5b7e76f1219b684d345a488ae5e3aa5f75ca)
---
 roles/cinder-volume.rb  | 1 +
 roles/ha-controller1.rb | 1 -
 roles/ha-controller2.rb | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/roles/cinder-volume.rb b/roles/cinder-volume.rb
index 0ef716a7..96e49b69 100644
--- 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
index bb9dfc2d..73646302 100644
--- 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
index 9f08286e..15daa76c 100644
--- 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]",