Merge lp:~james-page/charms/precise/nova-cloud-controller/grizzly-upgrade into lp:~openstack-charmers/charms/precise/nova-cloud-controller/ha-support

[James Page]

Add post-upgrade processing for folsom->grizzly upgrade

[lp:~james-page/charms/precise/nova-cloud-controller/grizzly-upgrade]

75. By James Page on 2013-05-22

Resync with updated charm helper

=== modified file 'hooks/lib/nova/grizzly'
--- hooks/lib/nova/grizzly	2013-04-04 17:29:23 +0000
+++ hooks/lib/nova/grizzly	2013-05-22 08:46:27 +0000
@@ -76,6 +76,22 @@
 nova_post_upgrade() {
   # Post-upgrade helper.  Caller should pass the version of OpenStack we are
   # upgrading from.
-  juju-log "$CHARM: Running post-upgrade hook: $upgrade_from -> folsom."
-  # nothing to do here yet.
+  local upgrade_from="$1"
+  juju-log "$CHARM: Running post-upgrade hook: $upgrade_from -> grizzly."
+  # We only support folsom -> grizzly, currently.
+  [[ "$upgrade_from" != "folsom" ]] &&
+    error_out "Unsupported upgrade: $upgrade_from -> grizzly"
+
+  # This may be dangerous, if we are upgrading a number of units at once
+  # and they all begin the same migration concurrently.  Migrate only from
+  # the cloud controller(s).
+  if [[ "$CHARM" == "nova-cloud-controller" ]] ; then
+    juju-log "$CHARM: Migrating nova database."
+    /usr/bin/nova-manage db sync
+
+    # Trigger a service restart on all other nova nodes.
+    trigger_remote_service_restarts
+  fi
+
+  juju-log "$CHARM: Post-upgrade hook complete: $upgrade_from -> grizzly."
 }

=== modified file 'revision'
--- revision	2013-04-25 17:02:49 +0000
+++ revision	2013-05-22 08:46:27 +0000
@@ -1,1 +1,1 @@
-262
+263