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

[Adam Gandelman]

This adds the charm bits around upgrading Openstack releases.

Upgrading /w ceph relations still needs some testing / isn't perfect:

- When upgrading OS release, librbd1 needs upgrading as well (cinders use of the library isn't backward compatable)
- After upgrading librdb1, the remote ceph cluster may need upgrading as well?

Testing fine with local storage/iscsi.

[lp:~gandelman-a/charms/precise/cinder/upgrade]

51. By Adam Gandelman on 2013-05-22

Move librbd1 upgrade out of for loop.

[James Page (james-page)]

Borked syntax:

+ [[ -n "$ceph_ids"] && apt-get -y install librbd1

I'd also recommend that you upgrade ceph-common; it has a hard dependency on the newer version of librdb1 so will do the same thing (thats what we install in the _joined hook).

The problem you are hitting is that cinder determines ceph backend features by looking at the options from the rbd and ceph command line tools; if the backend is not upgraded first, then cinder will try to use features which are not supported by the backend ceph.

This sucks.

review: Needs Fixing

[James Page (james-page)]

cinder-volume suggests ceph-common only; and no versioned dependency (we should sort that out).

[lp:~gandelman-a/charms/precise/cinder/upgrade]

52. By Adam Gandelman on 2013-05-24

Fix bad syntax, upgrade ceph-common instead of only librbd1.

[Adam Gandelman (gandelman-a)]

Fix syntax and upgrading ceph-common instead of librbd, to pull in all its deps.

review: Needs Resubmitting

[lp:~gandelman-a/charms/precise/cinder/upgrade]

53. By Adam Gandelman on 2013-05-24

Also upgrade python-ceph.

[James Page (james-page)]

review: Approve

=== modified file 'hooks/cinder-common'
--- hooks/cinder-common	2013-04-26 18:52:36 +0000
+++ hooks/cinder-common	2013-05-24 18:35:30 +0000
@@ -259,3 +259,46 @@
     keystone_joined "$r_id"
   done
 }
+
+do_openstack_upgrade() {
+  local rel="$1"
+  shift
+  local packages=$@
+  configure_install_source "$rel"
+  apt-get update
+  DEBIAN_FRONTEND=noninteractive apt-get \
+     --option Dpkg::Options::=--force-confnew -y \
+     install --no-install-recommends $packages
+  # update new configs for all possible relations
+  # mysql
+  for r_id in $(relation-ids shared-db); do
+    for unit in $(relation-list -r $r_id) ; do
+      juju-log "$CHARM: Configuring database after upgrade."
+      db_changed $r_id $unit
+    done
+  done
+  # rabbitmq-server
+  for r_id in $(relation-ids amqp); do
+    for unit in $(relation-list -r $r_id) ; do
+      juju-log "$CHARM: Configuring amqp after upgrade."
+      amqp_changed $r_id $unit
+    done
+  done
+  # keystone
+  for r_id in $(relation-ids identity-service); do
+    for unit in $(relation-list -r $r_id) ; do
+      juju-log "$CHARM: Configuring identity service after upgrade."
+      keystone_changed $r_id $unit
+    done
+  done
+  # ceph
+  local ceph_ids="$(relation-ids ceph)"
+  [[ -n "$ceph_ids" ]] && apt-get -y install ceph-common python-ceph
+  for r_id in $ceph_ids ; do
+    # ensure librbd gets updated with openstack
+    for unit in $(relation-list -r $r_id) ; do
+      juju-log "$CHARM: Configuring ceph client after upgarde."
+      ceph_changed $r_id $unit
+    done
+  done
+}

=== modified file 'hooks/cinder-hooks'
--- hooks/cinder-hooks	2013-05-20 10:29:08 +0000
+++ hooks/cinder-hooks	2013-05-24 18:35:30 +0000
@@ -45,8 +45,12 @@
 }
 
 db_changed() {
-  db_host=$(relation-get db_host)
-  db_password=$(relation-get password)
+  local r_id="$1"
+  local unit_id="$2"
+  local r_arg=""
+  [[ -n "$r_id" ]] && r_arg="-r $r_id"
+  db_host=$(relation-get $r_arg db_host $unit_id)
+  db_password=$(relation-get $r_arg password $unit_id)
 
   [[ -z "$db_host" ]] || [[ -z "$db_password" ]] &&
     juju-log "Missing DB_HOST|DB_PASSWORD, peer not ready? Will retry." &&
@@ -69,15 +73,19 @@
 }
 
 amqp_changed() {
-  rabbit_host=$(relation-get private-address)
-  rabbit_password=$(relation-get password)
+  local r_id="$1"
+  local unit_id="$2"
+  local r_arg=""
+  [[ -n "$r_id" ]] && r_arg="-r $r_id"
+  rabbit_host=$(relation-get $r_arg private-address $unit_id)
+  rabbit_password=$(relation-get $r_arg password $unit_id)
   [[ -z "$rabbit_host" ]] || [[ -z "$rabbit_password" ]] &&
     juju-log "Missing rabbit_host||rabbit_passwd, peer not ready? Will retry." && exit 0
-  local clustered=$(relation-get clustered)
+  local clustered=$(relation-get $r_arg clustered $unit_id)
   if [[ -n "$clustered" ]] ; then
     juju-log "$CHARM - amqp_changed: Configuring for access to haclustered "\
              "rabbitmq service."
-    local vip=$(relation-get vip)
+    local vip=$(relation-get $r_arg vip $unit_id)
     [[ -z "$vip" ]] && juju-log "$CHARM - amqp_changed: Clustered bu no vip."\
       && exit 0
     rabbit_host="$vip"
@@ -111,20 +119,22 @@
 }
 
 keystone_changed() {
-  service_port=$(relation-get service_port)
-  auth_port=$(relation-get auth_port)
-  service_username=$(relation-get service_username)
-  service_password=$(relation-get service_password)
-  service_tenant=$(relation-get service_tenant)
+  local r_id="$1"
+  local unit_id="$2"
+  local r_arg=""
+  [[ -n "$r_id" ]] && r_arg="-r $r_id"
+  service_port=$(relation-get $r_arg service_port $unit_id)
+  auth_port=$(relation-get $r_arg auth_port $unit_id)
+  service_username=$(relation-get $r_arg service_username $unit_id)
+  service_password=$(relation-get $r_arg service_password $unit_id)
+  service_tenant=$(relation-get $r_arg service_tenant $unit_id)
+  service_host=$(relation-get $r_arg service_host $unit_id)
+  auth_host=$(relation-get $r_arg auth_host $unit_id)
 
   [[ -z "$service_port" ]] || [[ -z "$auth_port" ]] ||
     [[ -z "$service_username" ]] || [[ -z "$service_password" ]] ||
     [[ -z "$service_tenant" ]] && juju-log "keystone_changed: Peer not ready" &&
       exit 0
-
-  service_host=$(relation-get service_host)
-  auth_host=$(relation-get auth_host)
-
   # update keystone authtoken settings accordingly
   set_or_update "service_host" "$service_host" "$API_CONF"
   set_or_update "service_port" "$service_port" "$API_CONF"
@@ -146,9 +156,13 @@
 }
 
 function ceph_changed {
+  local r_id="$1"
+  local unit_id="$2"
+  local r_arg=""
+  [[ -n "$r_id" ]] && r_arg="-r $r_id"
   SERVICE_NAME=`echo $JUJU_UNIT_NAME | cut -d / -f 1`
   KEYRING=/etc/ceph/ceph.client.$SERVICE_NAME.keyring
-  KEY=`relation-get key`
+  KEY=`relation-get $r_arg key $unit_id`
   if [ -n "$KEY" ]; then
     # But only once
     if [ ! -f $KEYRING ]; then
@@ -162,14 +176,14 @@
     exit 0
   fi
 
-  MONS=`relation-list`
+  MONS=`relation-list $r_arg`
   mon_hosts=""
   for mon in $MONS; do
-    mon_hosts="$mon_hosts $(get_ip $(relation-get private-address $mon)):6789"
+    mon_hosts="$mon_hosts $(get_ip $(relation-get $r_arg private-address $mon)):6789"
   done
   cat > /etc/ceph/ceph.conf << EOF
 [global]
- auth supported = $(relation-get auth)
+ auth supported = $(relation-get $r_id auth $unit_id)
  keyring = /etc/ceph/\$cluster.\$name.keyring
  mon host = $mon_hosts
 EOF
@@ -270,6 +284,17 @@
 }
 
 function config_changed() {
+  # possibly upgrade if openstack-origin has been bumped
+  local install_src=$(config-get openstack-origin)
+  local cur=$(get_os_codename_package "cinder-common")
+  local available=$(get_os_codename_install_source "$install_src")
+  if dpkg --compare-versions $(get_os_version_codename "$cur") lt \
+                             $(get_os_version_codename "$available") ; then
+    juju-log "$CHARM: Upgrading OpenStack release: $cur -> $available."
+    # need to explicitly upgrade ksc b/c (LP: 1182689)
+    do_openstack_upgrade "$install_src" $(determine_packages) python-keystoneclient
+  fi
+
   configure_https
   # Save our scriptrc env variables for health checks
   declare -a env_vars=(

=== modified file 'revision'
--- revision	2013-05-20 10:29:08 +0000
+++ revision	2013-05-24 18:35:30 +0000
@@ -1,1 +1,1 @@
-26
+27