From 55a942f6bbcd1f3eac7757f04110a0adba56e02c Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Fri, 6 Jun 2014 13:02:28 +0000
Subject: [PATCH] Add hooks for amqp-nova relation

---
 hooks/amqp-nova-relation-changed  |  1 +
 hooks/amqp-nova-relation-departed |  1 +
 hooks/amqp-nova-relation-joined   |  1 +
 hooks/quantum_hooks.py            | 17 +++++++++++++++++
 4 files changed, 20 insertions(+)
 create mode 120000 hooks/amqp-nova-relation-changed
 create mode 120000 hooks/amqp-nova-relation-departed
 create mode 120000 hooks/amqp-nova-relation-joined

diff --git a/hooks/amqp-nova-relation-changed b/hooks/amqp-nova-relation-changed
new file mode 120000
index 00000000..9a2da58e
--- /dev/null
+++ b/hooks/amqp-nova-relation-changed
@@ -0,0 +1 @@
+quantum_hooks.py
\ No newline at end of file
diff --git a/hooks/amqp-nova-relation-departed b/hooks/amqp-nova-relation-departed
new file mode 120000
index 00000000..9a2da58e
--- /dev/null
+++ b/hooks/amqp-nova-relation-departed
@@ -0,0 +1 @@
+quantum_hooks.py
\ No newline at end of file
diff --git a/hooks/amqp-nova-relation-joined b/hooks/amqp-nova-relation-joined
new file mode 120000
index 00000000..9a2da58e
--- /dev/null
+++ b/hooks/amqp-nova-relation-joined
@@ -0,0 +1 @@
+quantum_hooks.py
\ No newline at end of file
diff --git a/hooks/quantum_hooks.py b/hooks/quantum_hooks.py
index 8d0cac66..72bc1762 100755
--- a/hooks/quantum_hooks.py
+++ b/hooks/quantum_hooks.py
@@ -83,6 +83,8 @@ def config_changed():
         pgsql_db_joined(relation_id=r_id)
     for r_id in relation_ids('amqp'):
         amqp_joined(relation_id=r_id)
+    for r_id in relation_ids('amqp-nova'):
+        amqp_nova_joined(relation_id=r_id)
     if valid_plugin():
         CONFIGS.write_all()
         configure_ovs()
@@ -123,6 +125,12 @@ def pgsql_db_joined(relation_id=None):
                  relation_id=relation_id)
 
 
+@hooks.hook('amqp-nova-relation-joined')
+def amqp_nova_joined(relation_id=None):
+    relation_set(relation_id=relation_id,
+                 username=config('nova-rabbit-user'),
+                 vhost=config('nova-rabbit-vhost'))
+
 @hooks.hook('amqp-relation-joined')
 def amqp_joined(relation_id=None):
     relation_set(relation_id=relation_id,
@@ -130,6 +138,14 @@ def amqp_joined(relation_id=None):
                  vhost=config('rabbit-vhost'))
 
 
+@hooks.hook('amqp-nova-relation-departed')
+@restart_on_change(restart_map())
+def amqp_nova_departed():
+    if 'amqp-nova' not in CONFIGS.complete_contexts():
+        log('amqp relation incomplete. Peer not ready?')
+        return
+    CONFIGS.write_all()
+
 @hooks.hook('amqp-relation-departed')
 @restart_on_change(restart_map())
 def amqp_departed():
@@ -142,6 +158,7 @@ def amqp_departed():
 @hooks.hook('shared-db-relation-changed',
             'pgsql-db-relation-changed',
             'amqp-relation-changed',
+            'amqp-nova-relation-changed',
             'cluster-relation-changed',
             'cluster-relation-joined')
 @restart_on_change(restart_map())