From b73e8250a04b35495e53eb839d7877751901c171 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 9 Nov 2021 17:11:38 +0000
Subject: [PATCH] Remove chrony cleanup from overcloud host configure

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
---
 kayobe/cli/commands.py                 |  9 ---------
 kayobe/tests/unit/cli/test_commands.py | 26 +-------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py
index afc95bb43..6013a1891 100644
--- a/kayobe/cli/commands.py
+++ b/kayobe/cli/commands.py
@@ -1245,15 +1245,6 @@ class OvercloudHostUpgrade(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin,
             "overcloud-docker-sdk-upgrade", "overcloud-etc-hosts-fixup")
         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,
                               VaultMixin, Command):
diff --git a/kayobe/tests/unit/cli/test_commands.py b/kayobe/tests/unit/cli/test_commands.py
index b49d0ade4..d504092b7 100644
--- a/kayobe/tests/unit/cli/test_commands.py
+++ b/kayobe/tests/unit/cli/test_commands.py
@@ -1432,9 +1432,7 @@ class TestCase(unittest.TestCase):
 
     @mock.patch.object(commands.KayobeAnsibleMixin,
                        "run_kayobe_playbooks")
-    @mock.patch.object(commands.KollaAnsibleMixin,
-                       "run_kolla_ansible_overcloud")
-    def test_overcloud_host_upgrade(self, mock_kolla_run, mock_run):
+    def test_overcloud_host_upgrade(self, mock_run):
         command = commands.OvercloudHostUpgrade(TestApp(), [])
         parser = command.get_parser("test")
         parsed_args = parser.parse_args([])
@@ -1457,31 +1455,9 @@ class TestCase(unittest.TestCase):
                 ],
                 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)
 
-        expected_calls = [
-            mock.call(
-                mock.ANY,
-                "chrony-cleanup",
-            ),
-        ]
-        self.assertEqual(expected_calls, mock_kolla_run.call_args_list)
-
     @mock.patch.object(commands.KayobeAnsibleMixin,
                        "run_kayobe_playbooks")
     @mock.patch.object(commands.KollaAnsibleMixin,