changes for kilo to liberty upgrade
This commit is contained in:
parent
0229915a74
commit
8c1e20b87a
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ provides:
|
|||
interface: plumgrid-plugin
|
||||
requires:
|
||||
container:
|
||||
interface: juju-info
|
||||
interface: neutron-plugin-api
|
||||
scope: container
|
||||
identity-admin:
|
||||
interface: keystone-admin
|
||||
|
|
Loading…
Reference in New Issue