Merge lp:~james-page/charms/precise/cinder/fix-ceph-host-stickyness into lp:~openstack-charmers/charms/precise/cinder/ha-support

[James Page]

Couple of minor fixes

=== modified file 'hooks/cinder-hooks'
--- hooks/cinder-hooks	2013-03-08 21:29:37 +0000
+++ hooks/cinder-hooks	2013-03-13 21:23:18 +0000
@@ -189,6 +189,10 @@
   # Reconfigure cinder-volume
   set_or_update volume_driver cinder.volume.driver.RBDDriver
   set_or_update rbd_pool cinder
+  # Set host to service name to ensure that requests get
+  # distributed across all cinder servers in a cluster
+  # as they can all service ceph requests.
+  set_or_update host "$SERVICE_NAME"
   cinder_ctl "cinder-volume" restart
 }
 
@@ -199,7 +203,7 @@
   local cfg_api_port="$(config-get api-listening-port)"
   local haproxy_port="$(determine_haproxy_port $cfg_api_port)"
   local backend_port="$(determine_api_port $cfg_api_port)"
-  service cinder-api stop
+  service cinder-api stop || :
   configure_haproxy "cinder_api:$haproxy_port:$backend_port"
   set_or_update osapi_volume_listen_port  "$backend_port"
   service cinder-api start