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

[Adam Gandelman]

=== modified file 'hooks/lib/nova/essex'
--- hooks/lib/nova/essex	2012-12-17 23:27:41 +0000
+++ hooks/lib/nova/essex	2013-04-05 20:56:24 +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-17 23:45:59 +0000
+++ hooks/lib/nova/folsom	2013-04-05 20:56:24 +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:55:24 +0000
+++ hooks/lib/nova/grizzly	2013-04-05 20:56:24 +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:25:48 +0000
+++ hooks/lib/nova/nova-common	2013-04-05 20:56:24 +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-15 19:08:54 +0000
+++ hooks/lib/openstack-common	2013-04-05 20:56:24 +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-compute-common'
--- hooks/nova-compute-common	2013-03-25 16:23:50 +0000
+++ hooks/nova-compute-common	2013-04-05 20:56:24 +0000
@@ -124,6 +124,8 @@
       local keystone_host=$(relation-get keystone_host)
       [[ -z $keystone_host ]] && juju-log "nova-compute: Missing keystone host" \
         && exit 0
+      # XXX(adam_g): Need to check for unset values here, otherwise it errors
+      # if nova-c-c<->nova-compute is made before keystone<->nova-c-c
       set_or_update "network_api_class" "nova.network.quantumv2.api.API"
       set_or_update "quantum_auth_strategy" "keystone"
       set_or_update "quantum_url" "$(relation-get quantum_url)"

=== modified file 'hooks/nova-compute-relations'
--- hooks/nova-compute-relations	2013-04-04 20:48:36 +0000
+++ hooks/nova-compute-relations	2013-04-05 20:56:24 +0000
@@ -178,21 +178,27 @@
       done
       # Rabbit MQ relation may also already be in place
       # shared vhost with nova so just grab settings and
-      # configure
+      # configure. need to be sure to use VIP if clustered.
+      local rabbit_clustered="" rabbit_vip="" rabbit_host="" rabbit_password=""
       r_ids="$(relation-ids amqp)"
       for id in $r_ids ; do
         for unit in $(relation-list -r $id) ; do
-          local rabbit_host=$(relation-get -r $id private-address $unit)
-          local rabbit_password=$(relation-get -r $id password $unit)
-          if [[ -n $rabbit_host ]] && \
-             [[ -n $rabbit_password ]]; then
-            set_or_update rabbit_host "$rabbit_host" "$QUANTUM_CONF"
-            set_or_update rabbit_userid "$(config-get rabbit-user)" "$QUANTUM_CONF"
-            set_or_update rabbit_password "$rabbit_password" "$QUANTUM_CONF"
-            set_or_update rabbit_virtual_host "$(config-get rabbit-vhost)" "$QUANTUM_CONF"
-          fi
-        done
+          rabbit_clustered=$(relation-get -r $id clustered $unit)
+          rabbit_vip=$(relation-get -r $id vip $unit)
+          rabbit_host=$(relation-get -r $id private-address $unit)
+          rabbit_password=$(relation-get -r $id password $unit)
+       done
       done
+      if [[ -n "$rabbit_clustered" ]] ; then
+        rabbit_host="$rabbit_vip"
+      fi
+      if [[ -n $rabbit_host ]] && \
+         [[ -n $rabbit_password ]]; then
+        set_or_update rabbit_host "$rabbit_host" "$QUANTUM_CONF"
+        set_or_update rabbit_userid "$(config-get rabbit-user)" "$QUANTUM_CONF"
+        set_or_update rabbit_password "$rabbit_password" "$QUANTUM_CONF"
+        set_or_update rabbit_virtual_host "$(config-get rabbit-vhost)" "$QUANTUM_CONF"
+      fi
     else
       configure_network_manager "$network_manager"
     fi

=== modified file 'revision'
--- revision	2013-04-04 20:48:36 +0000
+++ revision	2013-04-05 20:56:24 +0000
@@ -1,1 +1,1 @@
-88
+89