Merge lp:~gandelman-a/charms/precise/swift-storage/upgrade into lp:~openstack-charmers/charms/precise/swift-storage/ha-support

[Adam Gandelman]

[James Page (james-page)]

review: Approve

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2013-04-26 21:48:49 +0000
+++ hooks/lib/openstack-common	2013-05-22 21:51:25 +0000
@@ -190,15 +190,26 @@
 }
 
 get_os_codename_package() {
-  local pkg_vers=$(dpkg -l | grep "$1" | awk '{ print $3 }') || echo "none"
+  local pkg_vers=$(dpkg -l | grep " $1 " | awk '{ print $3 }') || echo "none"
   pkg_vers=$(echo $pkg_vers | cut -d: -f2) # epochs
-  case "${pkg_vers:0:6}" in
-    "2011.2") echo "diablo" ;;
-    "2012.1") echo "essex" ;;
-    "2012.2") echo "folsom" ;;
-    "2013.1") echo "grizzly" ;;
-    "2013.2") echo "havana" ;;
-  esac
+  if echo "$1" | grep -q swift ; then
+    case "${pkg_vers:0:5}" in
+      "1.4.3") echo "diablo" ;;
+      "1.4.8") echo "essex" ;;
+      "1.7.4") echo "folsom" ;;
+      "1.7.6") echo "grizzly" ;;
+      "1.7.7") echo "grizzly" ;;
+      "1.8.0") echo "grizzly" ;;
+    esac
+  else
+    case "${pkg_vers:0:6}" in
+      "2011.2") echo "diablo" ;;
+      "2012.1") echo "essex" ;;
+      "2012.2") echo "folsom" ;;
+      "2013.1") echo "grizzly" ;;
+      "2013.2") echo "havana" ;;
+    esac
+  fi
 }
 
 get_os_version_codename() {

=== modified file 'hooks/swift-storage-node-common'
--- hooks/swift-storage-node-common	2013-04-25 19:43:44 +0000
+++ hooks/swift-storage-node-common	2013-05-22 21:51:25 +0000
@@ -4,6 +4,8 @@
 CHARM="swift-storage"
 HOOKS_DIR="$CHARM_DIR/hooks"
 
+CONF_DIR="/etc/swift"
+
 if [[ -e "$HOOKS_DIR/lib/openstack-common" ]] ; then
   . $HOOKS_DIR/lib/openstack-common
 else
@@ -130,3 +132,22 @@
   done
   chown -R swift:swift /srv/node
 }
+
+function do_openstack_upgrade {
+  # update openstack components to those provided by a new installation source
+  # it is assumed the calling hook has confirmed that the upgrade is sane.
+  local rel="$1"
+  shift
+  local packages=$@
+
+  # Backup the config directory.
+  local stamp=$(date +"%Y%m%d%M%S")
+  tar -pcf /var/lib/juju/$CHARM-backup-$stamp.tar $CONF_DIR
+
+  configure_install_source "$rel"
+  apt-get update
+  DEBIAN_FRONTEND=noninteractive apt-get \
+     --option Dpkg::Options::=--force-confnew -y \
+     install --no-install-recommends $packages
+  swift-init all restart || true
+}

=== modified file 'hooks/swift-storage-node-relations'
--- hooks/swift-storage-node-relations	2013-04-25 19:43:44 +0000
+++ hooks/swift-storage-node-relations	2013-05-22 21:51:25 +0000
@@ -12,7 +12,17 @@
 fi
 
 function config_changed {
-  
+  # perform openstack upgrade if openstack-origin has been bumped.
+  local install_src=$(config-get openstack-origin)
+  local cur=$(get_os_codename_package "python-swift")
+  local available=$(get_os_codename_install_source "$install_src")
+  if [[ "$available" != "unknown" ]] ; then
+    if dpkg --compare-versions $(get_os_version_codename "$cur") lt \
+                               $(get_os_version_codename "$available") ; then
+      juju-log "$CHARM: Upgrading OpenStack release: $cur -> $available."
+      do_openstack_upgrade "$install_src" $PACKAGES
+    fi
+  fi
   declare -a env_vars=()
   for i in account container object ; do
     port=$(config-get ${i}-server-port)
@@ -29,7 +39,7 @@
 
   # Save our scriptrc env variables for health checks
   save_script_rc ${env_vars[@]}
-} 
+}
 
 function install_hook {
   apt-get -y --force-yes install python-software-properties || exit 1
@@ -89,4 +99,5 @@
   "config-changed") config_changed ;;
   "swift-storage-relation-joined") storage_joined ;;
   "swift-storage-relation-changed") storage_changed ;;
+  "config-changed") config_changed ;;
 esac

=== modified file 'revision'
--- revision	2013-04-26 21:10:59 +0000
+++ revision	2013-05-22 21:51:25 +0000
@@ -1,1 +1,1 @@
-58
+59