From d3332cccf9ceeca9407b4b61d1b5acfef8ea6f64 Mon Sep 17 00:00:00 2001 From: David Ames Date: Tue, 16 Apr 2019 08:15:50 -0700 Subject: [PATCH] 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 --- actions/openstack_upgrade.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/actions/openstack_upgrade.py b/actions/openstack_upgrade.py index 7c6c4f92..c4a4d7e8 100755 --- a/actions/openstack_upgrade.py +++ b/actions/openstack_upgrade.py @@ -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__':