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
This commit is contained in:
Mark Goddard 2021-09-17 10:03:48 +01:00 committed by Radosław Piliszek
parent 3455105321
commit 6dc8b56390
2 changed files with 8 additions and 2 deletions

View File

@ -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] }}"

View File

@ -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.