From 36c2d398c03c90e21650f786a75c2fafc6c8d8e3 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@canonical.com>
Date: Tue, 21 May 2013 20:05:15 -0700
Subject: [PATCH] Also re-trigger existing swift relations after os upgrade.

---
 hooks/glance-common | 3 +++
 revision            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hooks/glance-common b/hooks/glance-common
index df66079f..af6f5ea9 100755
--- a/hooks/glance-common
+++ b/hooks/glance-common
@@ -126,6 +126,7 @@ do_openstack_upgrade() {
     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
@@ -133,6 +134,8 @@ do_openstack_upgrade() {
       ceph_changed "$r_id" "$unit"
     done
   done
+
+  [[ -n "$(relation-ids object-store)" ]] && object-store_joined
 }
 
 configure_https() {
diff --git a/revision b/revision
index b4f334f2..aaacbe66 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-141
+142