From 178f2ccef81d757899f71b82c74ea5bf04ba91c6 Mon Sep 17 00:00:00 2001 From: Junaid Ali Date: Sat, 23 Jul 2016 19:21:58 +0500 Subject: [PATCH] Changes: - Updated start-hook - Removed default value for management interface --- config.yaml | 1 - hooks/pg_dir_hooks.py | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index 677b62e..44de013 100644 --- a/config.yaml +++ b/config.yaml @@ -17,7 +17,6 @@ options: 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' diff --git a/hooks/pg_dir_hooks.py b/hooks/pg_dir_hooks.py index add2a4d..b5f91ff 100755 --- a/hooks/pg_dir_hooks.py +++ b/hooks/pg_dir_hooks.py @@ -161,11 +161,14 @@ def start(): ''' 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')