From cd97a9d721bc8d9536f7b24bce09fa07487b25a8 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 26 Jun 2019 15:22:11 +0100 Subject: [PATCH] Use new kolla-ansible upgrade-bifrost command This command slightly modifies the deploy operation to first stop the bifrost services and container if they are running. Change-Id: If0fe1115f01738254a61c0f5460548b0d6ae6b9a Depends-On: https://review.opendev.org/667630 Story: 2006050 Task: 34743 --- kayobe/cli/commands.py | 3 +-- kayobe/tests/unit/cli/test_commands.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py index 4998560cd..21000bb11 100644 --- a/kayobe/cli/commands.py +++ b/kayobe/cli/commands.py @@ -679,8 +679,7 @@ class SeedServiceUpgrade(KollaAnsibleMixin, KayobeAnsibleMixin, VaultMixin, playbooks = _build_playbook_list( "seed-service-upgrade-prep") self.run_kayobe_playbooks(parsed_args, playbooks) - - self.run_kolla_ansible_seed(parsed_args, "deploy-bifrost") + self.run_kolla_ansible_seed(parsed_args, "upgrade-bifrost") playbooks = _build_playbook_list( "overcloud-host-image-workaround-resolv", "overcloud-host-image-workaround-cloud-init", diff --git a/kayobe/tests/unit/cli/test_commands.py b/kayobe/tests/unit/cli/test_commands.py index 7e86c1e83..ef7d658ba 100644 --- a/kayobe/tests/unit/cli/test_commands.py +++ b/kayobe/tests/unit/cli/test_commands.py @@ -933,7 +933,7 @@ class TestCase(unittest.TestCase): expected_calls = [ mock.call( mock.ANY, - "deploy-bifrost", + "upgrade-bifrost", ), ] self.assertEqual(expected_calls, mock_kolla_run.call_args_list)