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

[Adam Gandelman]

=== modified file 'hooks/lib/nova/essex'
--- hooks/lib/nova/essex	2012-12-22 00:53:54 +0000
+++ hooks/lib/nova/essex	2013-04-05 20:55:28 +0000
@@ -39,4 +39,5 @@
     juju-log "$CHARM: Setting new option $key=$value in $conf_file"
     echo "$out$value" >>$conf_file
   fi
+  CONFIG_CHANGED=True
 }

=== modified file 'hooks/lib/nova/folsom'
--- hooks/lib/nova/folsom	2012-12-22 00:53:54 +0000
+++ hooks/lib/nova/folsom	2013-04-05 20:55:28 +0000
@@ -62,6 +62,7 @@
       fi
       ;;
   esac
+  CONFIG_CHANGED="True"
 }
 
 # Upgrade Helpers

=== modified file 'hooks/lib/nova/grizzly'
--- hooks/lib/nova/grizzly	2012-12-22 00:53:54 +0000
+++ hooks/lib/nova/grizzly	2013-04-05 20:55:28 +0000
@@ -63,6 +63,7 @@
       fi
       ;;
   esac
+  CONFIG_CHANGED="True"
 }
 
 # Upgrade Helpers

=== modified file 'hooks/lib/nova/nova-common'
--- hooks/lib/nova/nova-common	2013-01-08 23:24:04 +0000
+++ hooks/lib/nova/nova-common	2013-04-05 20:55:28 +0000
@@ -2,6 +2,8 @@
 
 # Common utility functions used across all nova charms.
 
+CONFIG_CHANGED=False
+
 # Load the common OpenStack helper library.
 if [[ -e $CHARM_DIR/lib/openstack-common ]] ; then
   . $CHARM_DIR/lib/openstack-common

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2013-03-19 22:41:03 +0000
+++ hooks/lib/openstack-common	2013-04-05 20:55:28 +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 'hooks/nova-cloud-controller-relations'
--- hooks/nova-cloud-controller-relations	2013-03-20 23:24:35 +0000
+++ hooks/nova-cloud-controller-relations	2013-04-05 20:55:28 +0000
@@ -183,12 +183,11 @@
     set_or_update sql_connection "mysql://quantum:$quantum_db_password@$db_host/quantum?charset=utf8" \
       $QUANTUM_PLUGIN_CONF "DATABASE"
   fi
-  determine_services
-  service_ctl all stop
 
   eligible_leader 'res_nova_vip' && /usr/bin/nova-manage db sync
 
-  service_ctl all start
+  determine_services
+  service_ctl all restart
 
   if [ "$NET_MANAGER" == "Quantum" ]; then
     configure_quantum_networking

=== modified file 'revision'
--- revision	2013-03-20 23:24:35 +0000
+++ revision	2013-04-05 20:55:28 +0000
@@ -1,1 +1,1 @@
-240
+261