Merge lp:~james-page/charms/precise/nova-cloud-controller/fixup-quantum-joined into lp:~charmers/charms/precise/nova-cloud-controller/trunk

Proposed by James Page
Status: Merged
Approved by: Adam Gandelman
Approved revision: 53
Merged at revision: 53
Proposed branch: lp:~james-page/charms/precise/nova-cloud-controller/fixup-quantum-joined
Merge into: lp:~charmers/charms/precise/nova-cloud-controller/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/nova_cc_hooks.py (+1/-1)
To merge this branch: bzr merge lp:~james-page/charms/precise/nova-cloud-controller/fixup-quantum-joined
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+192375@code.launchpad.net

Description of the change

Minor niggle with the propagation of data from keystone to quantum-gateway

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nova_cc_hooks.py'
2--- hooks/nova_cc_hooks.py 2013-09-30 14:58:45 +0000
3+++ hooks/nova_cc_hooks.py 2013-10-23 17:36:22 +0000
4@@ -314,7 +314,7 @@
5 if ks_auth_config and ks_ca:
6 rel_settings['ca_cert'] = ks_ca
7
8- relation_set(rid=rid, **rel_settings)
9+ relation_set(relation_id=rid, **rel_settings)
10
11
12 @hooks.hook('cluster-relation-changed',

Subscribers

People subscribed via source and target branches

to all changes: