openstack
/
charm-cinder
Code Issues Proposed changes

Automatically resume after openstack upgrade 

After an openstack upgrade automatically resume. Without this a gate in
config_changed stops configuration of keystone catalog entries. That
gate is still useful for the series-upgrade process.

Change-Id: I458a1ed6ebf51263785391785cabc17f716b6178
Closes-Bug: #1824545
This commit is contained in:
David Ames 2019-04-16 08:15:50 -07:00
parent b549dede62
commit d3332cccf9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/openstack_upgrade.py
View File

@ -33,6 +33,7 @@ _add_path(_root)
from charmhelpers.contrib.openstack.utils import (
do_action_openstack_upgrade,
is_unit_paused_set,
)
from charmhelpers.core.hookenv import (
@ -45,6 +46,7 @@ import cinder_hooks
from cinder_utils import (
do_openstack_upgrade,
register_configs,
resume_unit_helper,
)
@ -67,6 +69,9 @@ def openstack_upgrade():
# Force reload to get any chances resulting from upgrade.
# See LP 1726527.
cinder_hooks.CONFIGS = register_configs()
# If we are paused, resume LP Bug #1824545
if is_unit_paused_set():
resume_unit_helper(cinder_hooks.register_configs())
cinder_hooks.config_changed()
if __name__ == '__main__':