From cb629953c2d2b12e57cacb016a18c931c16d4246 Mon Sep 17 00:00:00 2001 From: Piotr Milewski Date: Wed, 18 Jun 2025 12:31:33 +0200 Subject: Standardize naming for MariaDB recovery and backup files This commit addresses and corrects the inconsistency in naming across multiple files within the project. Specifically, the terms mariadb_recovery and mariadb_backup have been replaced with mariadb-recovery and mariadb-backup respectively to adhere to the project's naming conventions and improve clarity. Change-Id: I47b80eaa0dc0487f506b47ca065951b5140e0d62 Signed-off-by: Piotr Milewski --- ansible/mariadb-backup.yml | 11 +++++++++++ ansible/mariadb-recovery.yml | 13 +++++++++++++ ansible/mariadb_backup.yml | 11 ----------- ansible/mariadb_recovery.yml | 13 ------------- doc/source/admin/mariadb-backup-and-restore.rst | 4 ++-- doc/source/reference/databases/mariadb-guide.rst | 2 +- kolla_ansible/cli/commands.py | 4 ++-- 7 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 ansible/mariadb-backup.yml create mode 100644 ansible/mariadb-recovery.yml delete mode 100644 ansible/mariadb_backup.yml delete mode 100644 ansible/mariadb_recovery.yml diff --git a/ansible/mariadb-backup.yml b/ansible/mariadb-backup.yml new file mode 100644 index 000000000..371991c86 --- /dev/null +++ b/ansible/mariadb-backup.yml @@ -0,0 +1,11 @@ +--- +- name: Backup MariaDB + hosts: mariadb + max_fail_percentage: >- + {{ mariadb_backup_max_fail_percentage | + default(kolla_max_fail_percentage) | + default(100) }} + roles: + - role: mariadb + tags: mariadb + when: enable_mariabackup | bool diff --git a/ansible/mariadb-recovery.yml b/ansible/mariadb-recovery.yml new file mode 100644 index 000000000..6f69867db --- /dev/null +++ b/ansible/mariadb-recovery.yml @@ -0,0 +1,13 @@ +--- +- name: Recover mariadb + hosts: mariadb + max_fail_percentage: >- + {{ mariadb_recovery_max_fail_percentage | + default(kolla_max_fail_percentage) | + default(100) }} + roles: + - role: mariadb + tags: mariadb + when: enable_mariadb | bool + vars: + mariadb_recover: true diff --git a/ansible/mariadb_backup.yml b/ansible/mariadb_backup.yml deleted file mode 100644 index 371991c86..000000000 --- a/ansible/mariadb_backup.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Backup MariaDB - hosts: mariadb - max_fail_percentage: >- - {{ mariadb_backup_max_fail_percentage | - default(kolla_max_fail_percentage) | - default(100) }} - roles: - - role: mariadb - tags: mariadb - when: enable_mariabackup | bool diff --git a/ansible/mariadb_recovery.yml b/ansible/mariadb_recovery.yml deleted file mode 100644 index 6f69867db..000000000 --- a/ansible/mariadb_recovery.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- name: Recover mariadb - hosts: mariadb - max_fail_percentage: >- - {{ mariadb_recovery_max_fail_percentage | - default(kolla_max_fail_percentage) | - default(100) }} - roles: - - role: mariadb - tags: mariadb - when: enable_mariadb | bool - vars: - mariadb_recover: true diff --git a/doc/source/admin/mariadb-backup-and-restore.rst b/doc/source/admin/mariadb-backup-and-restore.rst index aef6394a5..596b7f952 100644 --- a/doc/source/admin/mariadb-backup-and-restore.rst +++ b/doc/source/admin/mariadb-backup-and-restore.rst @@ -41,11 +41,11 @@ Backup Procedure To perform a full backup, run the following command: -``kolla-ansible mariadb_backup -i INVENTORY`` +``kolla-ansible mariadb-backup -i INVENTORY`` Or to perform an incremental backup: -``kolla-ansible mariadb_backup -i INVENTORY --incremental`` +``kolla-ansible mariadb-backup -i INVENTORY --incremental`` Kolla doesn't currently manage the scheduling of these backups, so you'll need to configure an appropriate scheduler (i.e cron) to run these commands diff --git a/doc/source/reference/databases/mariadb-guide.rst b/doc/source/reference/databases/mariadb-guide.rst index e34e4bf0a..c4a40740e 100644 --- a/doc/source/reference/databases/mariadb-guide.rst +++ b/doc/source/reference/databases/mariadb-guide.rst @@ -22,7 +22,7 @@ an independent Galera cluster. This section explains how to configure multiple database shards. Currently, only one shard is accessible via the HAProxy load balancer and supported -by the ``kolla-ansible mariadb_backup`` command. This will be improved +by the ``kolla-ansible mariadb-backup`` command. This will be improved in future by using ProxySQL, allowing load balanced access to all shards. Deployment diff --git a/kolla_ansible/cli/commands.py b/kolla_ansible/cli/commands.py index 7f9ecde6b..7b79b64ea 100644 --- a/kolla_ansible/cli/commands.py +++ b/kolla_ansible/cli/commands.py @@ -462,7 +462,7 @@ class MariaDBBackup(KollaAnsibleMixin, Command): extra_vars["kolla_action"] = "backup" extra_vars["mariadb_backup_type"] = parsed_args.mariadb_backup_type - playbooks = _choose_playbooks(parsed_args, "mariadb_backup") + playbooks = _choose_playbooks(parsed_args, "mariadb-backup") self.run_playbooks(parsed_args, playbooks, extra_vars=extra_vars) @@ -476,7 +476,7 @@ class MariaDBRecovery(KollaAnsibleMixin, Command): extra_vars = {} extra_vars["kolla_action"] = "deploy" - playbooks = _choose_playbooks(parsed_args, "mariadb_recovery") + playbooks = _choose_playbooks(parsed_args, "mariadb-recovery") self.run_playbooks(parsed_args, playbooks, extra_vars=extra_vars) -- cgit v1.2.3