openstack/charm-neutron-gateway
Code Issues Proposed changes

Fix action managed upgrades

Browse Source 
Use the resolve_CONFIGS function to resolve the current set
of CONFIGS for the charm, rather than directly referencing
the CONFIGS global variable which will not be initialized
during action invocation.

Change-Id: Ifd084c94c9808b49dda39bafed9345bfbf6aab81
Closes-Bug: 1876585
This commit is contained in:
James Page 2020-05-05 15:57:04 +01:00
parent 89d663a00f
commit de30b2f73d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/openstack_upgrade.py
View File

@ -25,7 +25,7 @@ from neutron_utils import (
from neutron_hooks import ( from neutron_hooks import (
config_changed, config_changed,
CONFIGS, resolve_CONFIGS,
) )
@ -39,7 +39,7 @@ def openstack_upgrade():
if do_action_openstack_upgrade(NEUTRON_COMMON, if do_action_openstack_upgrade(NEUTRON_COMMON,
do_openstack_upgrade, do_openstack_upgrade,
CONFIGS): resolve_CONFIGS()):
config_changed() config_changed()

1
unit_tests/test_actions_openstack_upgrade.py
View File

@ -14,6 +14,7 @@ TO_PATCH = [
'config_changed', 'config_changed',
'charmhelpers.core.hookenv.log', 'charmhelpers.core.hookenv.log',
'charmhelpers.contrib.openstack.utils.juju_log', 'charmhelpers.contrib.openstack.utils.juju_log',
'resolve_CONFIGS',
] ]