From 7743e781e91c63907dec845194cd220c641e3e25 Mon Sep 17 00:00:00 2001 From: James Page Date: Mon, 31 Mar 2014 14:05:15 +0100 Subject: [PATCH] Make pgsql_db_joined callable outside context --- hooks/quantum_hooks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hooks/quantum_hooks.py b/hooks/quantum_hooks.py index db8831d5..969b420a 100755 --- a/hooks/quantum_hooks.py +++ b/hooks/quantum_hooks.py @@ -111,14 +111,15 @@ def db_joined(relation_id=None): @hooks.hook('pgsql-db-relation-joined') -def pgsql_db_joined(): +def pgsql_db_joined(relation_id=None): if is_relation_made('shared-db'): # raise error e = ('Attempting to associate a postgresql database when there is already ' 'associated a mysql one') log(e, level=ERROR) raise Exception(e) - relation_set(database=config('database')) + relation_set(database=config('database'), + relation_id=relation_id) @hooks.hook('amqp-relation-joined')