From 1710af579246f6f7ee08dc25a55b2ebdba4232a4 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 31 Oct 2024 13:38:10 +0100 Subject: [PATCH] Update kolla-ansible mariadb commands These commands were renamed in the kolla-ansible CLI rewrite [1]. [1] https://review.opendev.org/c/openstack/kolla-ansible/+/923110 Change-Id: Ife01620ec75bce441004562865a321721491be5d --- kayobe/cli/commands.py | 4 ++-- kayobe/tests/unit/cli/test_commands.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py index 641989615..be233af7f 100644 --- a/kayobe/cli/commands.py +++ b/kayobe/cli/commands.py @@ -1321,7 +1321,7 @@ class OvercloudDatabaseBackup(KollaAnsibleMixin, KayobeAnsibleMixin, extra_args = [] if parsed_args.incremental: extra_args.append('--incremental') - self.run_kolla_ansible_overcloud(parsed_args, "mariadb_backup", + self.run_kolla_ansible_overcloud(parsed_args, "mariadb-backup", extra_args=extra_args) @@ -1349,7 +1349,7 @@ class OvercloudDatabaseRecover(KollaAnsibleMixin, KayobeAnsibleMixin, if parsed_args.force_recovery_host: extra_vars['mariadb_recover_inventory_name'] = ( parsed_args.force_recovery_host) - self.run_kolla_ansible_overcloud(parsed_args, "mariadb_recovery", + self.run_kolla_ansible_overcloud(parsed_args, "mariadb-recovery", extra_vars=extra_vars) diff --git a/kayobe/tests/unit/cli/test_commands.py b/kayobe/tests/unit/cli/test_commands.py index 6d49a442d..f50a6e1e7 100644 --- a/kayobe/tests/unit/cli/test_commands.py +++ b/kayobe/tests/unit/cli/test_commands.py @@ -1450,7 +1450,7 @@ class TestCase(unittest.TestCase): expected_calls = [ mock.call( mock.ANY, - "mariadb_backup", + "mariadb-backup", extra_args=[] ), ] @@ -1482,7 +1482,7 @@ class TestCase(unittest.TestCase): expected_calls = [ mock.call( mock.ANY, - "mariadb_backup", + "mariadb-backup", extra_args=["--incremental"] ), ] @@ -1522,7 +1522,7 @@ class TestCase(unittest.TestCase): expected_calls = [ mock.call( mock.ANY, - "mariadb_recovery", + "mariadb-recovery", extra_vars={} ), ] @@ -1563,7 +1563,7 @@ class TestCase(unittest.TestCase): expected_calls = [ mock.call( mock.ANY, - "mariadb_recovery", + "mariadb-recovery", extra_vars={ "mariadb_recover_inventory_name": "foo" }