openstack/kayobe
Code Issues Proposed changes

Remove chrony cleanup from overcloud host configure

Browse Source 
The chrony container removal was performed in the Xena cycle, so we no
longer require this in the 'overcloud host configure' command.

Change-Id: Ic6909bba42b07a5f3528e7507cb3b25199a72b43
This commit is contained in:
Mark Goddard 2021-11-09 17:11:38 +00:00
parent 561ee09c03
commit b73e8250a0
2 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kayobe/cli/commands.py
View File

@ -1245,15 +1245,6 @@ class OvercloudHostUpgrade(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
"overcloud-docker-sdk-upgrade", "overcloud-etc-hosts-fixup") "overcloud-docker-sdk-upgrade", "overcloud-etc-hosts-fixup")
self.run_kayobe_playbooks(parsed_args, playbooks, limit="overcloud") self.run_kayobe_playbooks(parsed_args, playbooks, limit="overcloud")
# TODO(mgoddard): Remove this in Y cycle after Kolla Ansible chrony
# container has been dropped for a cycle.
# NOTE(mgoddard): Clean up the chrony container if it exists, and
# deploy a host chrony daemon.
self.generate_kolla_ansible_config(parsed_args, service_config=False)
self.run_kolla_ansible_overcloud(parsed_args, "chrony-cleanup")
playbooks = _build_playbook_list("time")
self.run_kayobe_playbooks(parsed_args, playbooks, limit="overcloud")
class OvercloudDatabaseBackup(KollaAnsibleMixin, KayobeAnsibleMixin, class OvercloudDatabaseBackup(KollaAnsibleMixin, KayobeAnsibleMixin,
VaultMixin, Command): VaultMixin, Command):

26
kayobe/tests/unit/cli/test_commands.py
View File

@ -1432,9 +1432,7 @@ class TestCase(unittest.TestCase):
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@mock.patch.object(commands.KollaAnsibleMixin, def test_overcloud_host_upgrade(self, mock_run):
"run_kolla_ansible_overcloud")
def test_overcloud_host_upgrade(self, mock_kolla_run, mock_run):
command = commands.OvercloudHostUpgrade(TestApp(), []) command = commands.OvercloudHostUpgrade(TestApp(), [])
parser = command.get_parser("test") parser = command.get_parser("test")
parsed_args = parser.parse_args([]) parsed_args = parser.parse_args([])
@ -1457,31 +1455,9 @@ class TestCase(unittest.TestCase):
], ],
limit="overcloud", limit="overcloud",
), ),
mock.call(
mock.ANY,
[utils.get_data_files_path("ansible", "kolla-ansible.yml")],
ignore_limit=True,
tags="config",
),
mock.call(
mock.ANY,
[
utils.get_data_files_path(
"ansible", "time.yml"),
],
limit="overcloud",
),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertEqual(expected_calls, mock_run.call_args_list)
expected_calls = [
mock.call(
mock.ANY,
"chrony-cleanup",
),
]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@mock.patch.object(commands.KollaAnsibleMixin, @mock.patch.object(commands.KollaAnsibleMixin,