From 8c1e20b87aa4acf19918f834255ba30c72e0f07a Mon Sep 17 00:00:00 2001 From: Junaid Ali Date: Tue, 19 Apr 2016 05:47:27 -0700 Subject: [PATCH] changes for kilo to liberty upgrade --- config.yaml | 4 ++-- hooks/neutron_plumgrid_utils.py | 3 +++ metadata.yaml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config.yaml b/config.yaml index 6800ca1..b526d26 100644 --- a/config.yaml +++ b/config.yaml @@ -30,13 +30,13 @@ options: type: string description: Password to access PLUMgrid Director plumgrid-virtual-ip: - default: + default: 192.168.100.250 type: string description: IP address of PLUMgrid Director # end of PLUMgrid configuration manage-neutron-plugin-legacy-mode: type: boolean - default: False + default: True description: | If True neutron-api charm will install neutron packages for the plugin configured. Also needs to be set in neutron-api charm diff --git a/hooks/neutron_plumgrid_utils.py b/hooks/neutron_plumgrid_utils.py index d123233..369589d 100644 --- a/hooks/neutron_plumgrid_utils.py +++ b/hooks/neutron_plumgrid_utils.py @@ -91,6 +91,9 @@ def resource_map(): hook execution. ''' resource_map = deepcopy(BASE_RESOURCE_MAP) + is_legacy_mode = config('manage-neutron-plugin-legacy-mode') + if is_legacy_mode: + del resource_map[PLUMGRID_CONF] return resource_map diff --git a/metadata.yaml b/metadata.yaml index 6ec21cc..8ad5126 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -25,7 +25,7 @@ provides: interface: plumgrid-plugin requires: container: - interface: juju-info + interface: neutron-plugin-api scope: container identity-admin: interface: keystone-admin