Juju Charms Collection
contrail-analytics package

Merge lp:~joeborg/charms/trusty/contrail-analytics/rbac into lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk

  1. Trusty Tahr (14.04)
  2. rbac
  3. Merge into trunk
Proposed by Joseph Borg
Status: Merged
Merged at revision: 41
Proposed branch: lp:~joeborg/charms/trusty/contrail-analytics/rbac
Merge into: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk
Diff against target: 13 lines (+2/-1)
1 file modified
hooks/contrail_analytics_utils.py (+2/-1)
To merge this branch: bzr merge lp:~joeborg/charms/trusty/contrail-analytics/rbac
Reviewer Review Type Date Requested Status
Robert Ayres (community) Approve
Review via email: mp+329382@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Ayres (robert-ayres) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/contrail_analytics_utils.py'
2--- hooks/contrail_analytics_utils.py 2017-06-29 01:57:10 +0000
3+++ hooks/contrail_analytics_utils.py 2017-08-22 18:27:44 +0000
4@@ -122,7 +122,8 @@
5 ctxs = [ { "api_server": vip if vip \
6 else gethostbyname(relation_get("private-address", unit, rid)),
7 "api_port": port,
8- "cloud_admin_role": relation_get("cloud-admin-role", unit, rid) }
9+ "cloud_admin_role": relation_get("cloud-admin-role", unit, rid),
10+ "rbac": relation_get("rbac", unit, rid) }
11 for rid in relation_ids("contrail-api")
12 for unit, port, vip in
13 ((unit, relation_get("port", unit, rid), relation_get("vip", unit, rid))

Subscribers

People subscribed via source and target branches

to all changes: