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

[Adam Gandelman]

Adds upgrade support with existing ceph + swift relations. Both tested okay and images could be added and retrieved after upgrade for both backend.

[James Page (james-page)]

Same comment as for cinder - I'd upgrade the _joined dependency:

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

In this case:

ceph-common python-ceph

Other than that works for me.

review: Approve

=== modified file 'hooks/glance-common'
--- hooks/glance-common	2013-04-26 21:07:21 +0000
+++ hooks/glance-common	2013-05-22 03:06:28 +0000
@@ -126,6 +126,16 @@
     juju-log "$CHARM: Configuring identity service after upgrade to $rel."
     keystone_changed $r_id
   fi
+
+  local ceph_ids="$(relation-ids ceph)"
+  [[ -n "$ceph_ids" ]] && apt-get -y install librbd1
+  for r_id in $ceph_ids ; do
+    for unit in $(relation-list -r $r_id) ; do
+      ceph_changed "$r_id" "$unit"
+    done
+  done
+
+  [[ -n "$(relation-ids object-store)" ]] && object-store_joined
 }
 
 configure_https() {

=== modified file 'hooks/glance-relations'
--- hooks/glance-relations	2013-04-26 21:07:51 +0000
+++ hooks/glance-relations	2013-05-22 03:06:28 +0000
@@ -145,9 +145,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
@@ -161,14 +165,14 @@
     exit 0
   fi
 
-  MONS=`relation-list`
+  MONS=`relation-list $r_arg`
   mon_hosts=""
   for mon in $MONS; do
-    mon_hosts="$mon_hosts`relation-get private-address $mon`:6789,"
+    mon_hosts="$mon_hosts`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_arg auth $unit_id)
  keyring = /etc/ceph/\$cluster.\$name.keyring
  mon host = $mon_hosts
 EOF

=== modified file 'revision'
--- revision	2013-04-26 21:09:06 +0000
+++ revision	2013-05-22 03:06:28 +0000
@@ -1,1 +1,1 @@
-141
+142