From 6dc8b5639024d4e925c6a85e4c6d554e91d2a6c2 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 17 Sep 2021 10:03:48 +0100
Subject: [PATCH] Use mariadb_tag as default for all mariadb tags
This allows one variable to specify the tag for all MariaDB images.
Change-Id: I164cdd41787f8bd52d8e08cb380d42625a8bbd84
TrivialFix
---
ansible/roles/mariadb/defaults/main.yml | 4 ++--
releasenotes/notes/mariadb-tag-6f08b8d5874c9106.yaml | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 releasenotes/notes/mariadb-tag-6f08b8d5874c9106.yaml
diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml
index 4ee3a0386b..e6576a5523 100644
--- a/ansible/roles/mariadb/defaults/main.yml
+++ b/ansible/roles/mariadb/defaults/main.yml
@@ -70,7 +70,7 @@ mariadb_image_full: "{{ mariadb_image }}:{{ mariadb_tag }}"
mariadb_clustercheck_install_type: "{{ kolla_install_type }}"
mariadb_clustercheck_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ mariadb_clustercheck_install_type }}-mariadb-clustercheck"
-mariadb_clustercheck_tag: "{{ openstack_tag }}"
+mariadb_clustercheck_tag: "{{ mariadb_tag }}"
mariadb_clustercheck_image_full: "{{ mariadb_clustercheck_image }}:{{ mariadb_clustercheck_tag }}"
mariadb_dimensions: "{{ default_container_dimensions }}"
@@ -106,7 +106,7 @@ mariadb_wsrep_extra_provider_options: []
# Backups
####################
mariabackup_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ mariadb_install_type }}-mariadb-server"
-mariabackup_tag: "{{ openstack_tag }}"
+mariabackup_tag: "{{ mariadb_tag }}"
mariabackup_image_full: "{{ mariabackup_image }}:{{ mariabackup_tag }}"
mariadb_backup_host: "{{ groups[mariadb_shard_group][0] }}"
diff --git a/releasenotes/notes/mariadb-tag-6f08b8d5874c9106.yaml b/releasenotes/notes/mariadb-tag-6f08b8d5874c9106.yaml
new file mode 100644
index 0000000000..39a1cffdca
--- /dev/null
+++ b/releasenotes/notes/mariadb-tag-6f08b8d5874c9106.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ Changes the default of ``mariadb_clustercheck_tag`` and ``mariabackup_tag``
+ from ``openstack_tag`` to ``mariadb_tag``. This allows one variable to set
+ the tag for all MariaDB images.