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

[Junaid Ali]

[Bilal Baqar (bbaqar)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2016-06-19 18:52:37 +0000
+++ config.yaml	2016-07-27 19:40:09 +0000
@@ -17,7 +17,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_dir_hooks.py'
--- hooks/pg_dir_hooks.py	2016-05-22 15:17:41 +0000
+++ hooks/pg_dir_hooks.py	2016-07-27 19:40:09 +0000
@@ -161,11 +161,14 @@
     '''
     if config('plumgrid-license-key') is not None:
         count = 0
-        while (count < 10):
+        while (count < 15):
             if post_pg_license():
                 break
             count += 1
             time.sleep(15)
+        if count == 15:
+            raise ValueError("Error occurred while posting plumgrid license"
+                             "key. Please check plumgrid services.")
 
 
 @hooks.hook('upgrade-charm')

=== modified file 'hooks/pg_dir_utils.py'
--- hooks/pg_dir_utils.py	2016-06-19 18:52:37 +0000
+++ hooks/pg_dir_utils.py	2016-07-27 19:40:09 +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'