Rebase on trunk

config.yaml

@@ -23,7 +23,7 @@ options:
     type: string
     description: Username used to access rabbitmq queue
   rabbit-vhost:
-    default: nova
+    default: openstack
     type: string
     decsription: Rabbitmq vhost
   database-user:

hooks/nova_compute_hooks.py

@@ -81,9 +81,10 @@ def config_changed():
 
 
 @hooks.hook('amqp-relation-joined')
-@restart_on_change(restart_map())
-def amqp_joined():
-    relation_set(username=config('rabbit-user'), vhost=config('rabbit-vhost'))
+def amqp_joined(relation_id=None):
+    relation_set(relation_id=relation_id,
+                 username=config('rabbit-user'),
+                 vhost=config('rabbit-vhost'))
 
 
 @hooks.hook('amqp-relation-changed')
@@ -202,6 +203,12 @@ def relation_broken():
     CONFIGS.write_all()
 
 
+@hooks.hook('upgrade-charm')
+def upgrade_charm():
+    for r_id in relation_ids('amqp'):
+        amqp_joined(relation_id=r_id)
+
+
 def main():
     try:
         hooks.execute(sys.argv)

hooks/upgrade-charm

@@ -0,0 +1 @@
+nova_compute_hooks.py

unit_tests/test_nova_compute_hooks.py

@@ -105,7 +105,8 @@ class NovaComputeRelationsTests(CharmTestCase):
 
     def test_amqp_joined(self):
         hooks.amqp_joined()
-        self.relation_set.assert_called_with(username='nova', vhost='nova')
+        self.relation_set.assert_called_with(username='nova', vhost='openstack',
+                                             relation_id=None)
 
     @patch.object(hooks, 'CONFIGS')
     def test_amqp_changed_missing_relation_data(self, configs):