From 52145181c8bc7690d50492ac58eec3164eeb77ff Mon Sep 17 00:00:00 2001 From: Billy Olsen Date: Mon, 25 Oct 2021 17:52:06 -0700 Subject: [PATCH] Force resolve configs after openstack-upgrade action Force resolve the global configs option after an openstack upgrade action is run but before the config_changed hook is run. This ensures that the global CONFIGS values are updated to the appropriate templates before rendering the update config. Change-Id: Id8ed2f6d60cf79e1360ca7587aa771ffbe1af9aa Closes-Bug: 1928853 --- actions/openstack_upgrade.py | 1 + unit_tests/test_actions_openstack_upgrade.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/actions/openstack_upgrade.py b/actions/openstack_upgrade.py index 9c6dc4f9..f966e072 100755 --- a/actions/openstack_upgrade.py +++ b/actions/openstack_upgrade.py @@ -54,6 +54,7 @@ def openstack_upgrade(): if do_action_openstack_upgrade('openstack-dashboard', do_openstack_upgrade, CONFIGS): + resolve_CONFIGS(force_update=True) config_changed() diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py index 1b8e0a34..f9e0d295 100644 --- a/unit_tests/test_actions_openstack_upgrade.py +++ b/unit_tests/test_actions_openstack_upgrade.py @@ -15,7 +15,7 @@ import os import sys -from unittest.mock import patch, MagicMock +from unittest.mock import call, patch, MagicMock os.environ['JUJU_UNIT_NAME'] = 'openstack-dashboard' @@ -58,6 +58,10 @@ class TestHorizonUpgradeActions(CharmTestCase): 'openstack-dashboard', self.do_openstack_upgrade, 'configs') + self.resolve_CONFIGS.assert_has_calls([ + call(), + call(force_update=True), + ]) self.config_changed.assert_called_once_with() def test_openstack_upgrade_false(self):