Merge lp:~junaidali/charms/trusty/plumgrid-gateway/mgmt_val into lp:~plumgrid-team/charms/trusty/plumgrid-gateway/trunk

Proposed by Junaid Ali on 2016-07-27
Status: Merged
Merged at revision: 31
Proposed branch: lp:~junaidali/charms/trusty/plumgrid-gateway/mgmt_val
Merge into: lp:~plumgrid-team/charms/trusty/plumgrid-gateway/trunk
Diff against target: 26 lines (+3/-2)
2 files modified
config.yaml (+0/-1)
hooks/pg_gw_utils.py (+3/-1)
To merge this branch: bzr merge lp:~junaidali/charms/trusty/plumgrid-gateway/mgmt_val
Reviewer Review Type Date Requested Status
Bilal Baqar 2016-07-27 Approve on 2016-07-27
Review via email: mp+301315@code.launchpad.net
To post a comment you must log in.
Bilal Baqar (bbaqar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2016-06-19 18:54:39 +0000
3+++ config.yaml 2016-07-27 19:08:53 +0000
4@@ -11,7 +11,6 @@
5 description: Public SSH key of PLUMgrid LCM which is running PG-Tools
6 mgmt-interface:
7 type: string
8- default: 'juju-br0'
9 description: The interface connected to PLUMgrid Managment network.
10 fabric-interfaces:
11 default: 'MANAGEMENT'
12
13=== modified file 'hooks/pg_gw_utils.py'
14--- hooks/pg_gw_utils.py 2016-06-19 18:54:39 +0000
15+++ hooks/pg_gw_utils.py 2016-07-27 19:08:53 +0000
16@@ -222,7 +222,9 @@
17 Returns the managment interface.
18 '''
19 mgmt_interface = config('mgmt-interface')
20- if interface_exists(mgmt_interface):
21+ if not mgmt_interface:
22+ return get_iface_from_addr(unit_get('private-address'))
23+ elif interface_exists(mgmt_interface):
24 return mgmt_interface
25 else:
26 log('Provided managment interface %s does not exist'

Subscribers

People subscribed via source and target branches