Merge lp:~gandelman-a/charms/precise/cinder/avoid_restarts into lp:~openstack-charmers/charms/precise/cinder/ha-support

[Adam Gandelman]

=== modified file 'hooks/cinder-common'
--- hooks/cinder-common	2013-02-20 01:42:47 +0000
+++ hooks/cinder-common	2013-04-05 20:55:29 +0000
@@ -10,6 +10,8 @@
 CINDER_CONF="/etc/cinder/cinder.conf"
 API_CONF="/etc/cinder/api-paste.ini"
 
+CONFIG_CHANGED="False"
+
 if [[ -e $CHARM_DIR/lib/openstack-common ]] ; then
   . $CHARM_DIR/lib/openstack-common
 else
@@ -77,6 +79,7 @@
     juju-log "cinder: Setting new option $KEY=$VALUE in $CONF_FILE"
     echo "$out$VALUE" >>$CONF_FILE
   fi
+  CONFIG_CHANGED="True"
 }
 
 cinder_ctl() {
@@ -90,16 +93,8 @@
   else
     svcs=$svc
   fi
-  for s in $svcs ; do
-    case "$action" in
-      "start")
-        service_ctl_status $s || service $s start ;;
-      "stop")
-        service_ctl_status $s && service $s stop || return 0 ;;
-      "restart")
-        service_ctl_status $s && service $s restart || service $s start ;;
-    esac
-  done
+  SERVICES=$svcs
+  service_ctl all $action
 }
 
 clean_storage() {

=== modified file 'hooks/cinder-hooks'
--- hooks/cinder-hooks	2013-03-27 14:56:53 +0000
+++ hooks/cinder-hooks	2013-04-05 20:55:29 +0000
@@ -56,11 +56,10 @@
   cinder_db=$(config-get cinder-db)
   juju-log "cinder: Configuring cinder for database access to $cinder_db@$db_host"
   set_or_update sql_connection "mysql://$db_user:$db_password@$db_host/$cinder_db"
-  cinder_ctl all stop
   if eligible_leader 'res_cinder_vip'; then
       /usr/bin/cinder-manage db sync
   fi
-  cinder_ctl all start
+  cinder_ctl all restart
 }
 
 amqp_joined() {

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2013-03-15 19:08:12 +0000
+++ hooks/lib/openstack-common	2013-04-05 20:55:29 +0000
@@ -20,6 +20,9 @@
 
 function service_ctl {
   # control a specific service, or all (as defined by $SERVICES)
+  # service restarts will only occur depending on global $CONFIG_CHANGED,
+  # which should be updated in charm's set_or_update().
+  local config_changed=${CONFIG_CHANGED:-True}
   if [[ $1 == "all" ]] ; then
     ctl="$SERVICES"
   else
@@ -37,12 +40,21 @@
       "stop")
         service_ctl_status $i && service $i stop || return 0 ;;
       "restart")
-        service_ctl_status $i && service $i restart || service $i start ;;
+        if [[ "$config_changed" == "True" ]] ; then
+          service_ctl_status $i && service $i restart || service $i start
+        fi
+        ;;
     esac
     if [[ $? != 0 ]] ; then
       juju-log "$CHARM: service_ctl ERROR - Service $i failed to $action"
     fi
   done
+  # all configs should have been reloaded on restart of all services, reset
+  # flag if its being used.
+  if [[ "$action" == "restart" ]] && [[ -n "$CONFIG_CHANGED" ]] &&
+     [[ "$ctl" == "all" ]]; then
+    CONFIG_CHANGED="False"
+  fi
 }
 
 function configure_install_source {

=== modified file 'revision'
--- revision	2013-03-27 14:56:53 +0000
+++ revision	2013-04-05 20:55:29 +0000
@@ -1,1 +1,1 @@
-23
+25