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

[Junaid Ali]

[Bilal Baqar (bbaqar)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2016-06-19 18:54:39 +0000
+++ config.yaml	2016-07-27 19:08:53 +0000
@@ -11,7 +11,6 @@
     description: Public SSH key of PLUMgrid LCM which is running PG-Tools
   mgmt-interface:
     type: string
-    default: 'juju-br0'
     description: The interface connected to PLUMgrid Managment network.
   fabric-interfaces:
     default: 'MANAGEMENT'
 
=== modified file 'hooks/pg_gw_utils.py'
--- hooks/pg_gw_utils.py	2016-06-19 18:54:39 +0000
+++ hooks/pg_gw_utils.py	2016-07-27 19:08:53 +0000
@@ -222,7 +222,9 @@
     Returns the managment interface.
     '''
     mgmt_interface = config('mgmt-interface')
-    if interface_exists(mgmt_interface):
+    if not mgmt_interface:
+        return get_iface_from_addr(unit_get('private-address'))
+    elif interface_exists(mgmt_interface):
         return mgmt_interface
     else:
         log('Provided managment interface %s does not exist'