x
/
charm-neutron-api-plumgrid
Code Issues Proposed changes

changes for kilo to liberty upgrade

This commit is contained in:
Junaid Ali 2016-04-19 05:47:27 -07:00
parent 0229915a74
commit 8c1e20b87a
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.yaml
View File

@ -30,13 +30,13 @@ options:
type: string type: string
description: Password to access PLUMgrid Director description: Password to access PLUMgrid Director
plumgrid-virtual-ip: plumgrid-virtual-ip:
default: default: 192.168.100.250
type: string type: string
description: IP address of PLUMgrid Director description: IP address of PLUMgrid Director
# end of PLUMgrid configuration # end of PLUMgrid configuration
manage-neutron-plugin-legacy-mode: manage-neutron-plugin-legacy-mode:
type: boolean type: boolean
default: False default: True
description: | description: |
If True neutron-api charm will install neutron packages for the plugin If True neutron-api charm will install neutron packages for the plugin
configured. Also needs to be set in neutron-api charm configured. Also needs to be set in neutron-api charm

3
hooks/neutron_plumgrid_utils.py
View File

@ -91,6 +91,9 @@ def resource_map():
hook execution. hook execution.
''' '''
resource_map = deepcopy(BASE_RESOURCE_MAP) 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 return resource_map

2
metadata.yaml
View File

@ -25,7 +25,7 @@ provides:
interface: plumgrid-plugin interface: plumgrid-plugin
requires: requires:
container: container:
interface: juju-info interface: neutron-plugin-api
scope: container scope: container
identity-admin: identity-admin:
interface: keystone-admin interface: keystone-admin