From a7941e2498f64e26c95a9c148db8ad174be032bb Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 17 Sep 2020 12:29:30 +0200 Subject: [PATCH] Change mariadb image to mariadb-server Since change [1] merged we have two mariadb images (mariadb and mariadb-server) Let's use mariadb-server in kolla-ansible, so we can deprecate mariadb image. [1]: https://review.opendev.org/#/c/710217/ Change-Id: I4ae2ccaaba8fb516f469f4ce8628e8c61de03f0d --- ansible/roles/mariadb/defaults/main.yml | 2 +- .../notes/mariadb-server-image-be5f77966586ef39.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/mariadb-server-image-be5f77966586ef39.yaml diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml index 8d6e493df0..8b3dc066d6 100644 --- a/ansible/roles/mariadb/defaults/main.yml +++ b/ansible/roles/mariadb/defaults/main.yml @@ -64,7 +64,7 @@ external_haproxy_members: "{% for host in groups['mariadb'] %}server {{ host }} # Docker #################### mariadb_install_type: "{{ kolla_install_type }}" -mariadb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ mariadb_install_type }}-mariadb" +mariadb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ mariadb_install_type }}-mariadb-server" mariadb_tag: "{{ openstack_tag }}" mariadb_image_full: "{{ mariadb_image }}:{{ mariadb_tag }}" diff --git a/releasenotes/notes/mariadb-server-image-be5f77966586ef39.yaml b/releasenotes/notes/mariadb-server-image-be5f77966586ef39.yaml new file mode 100644 index 0000000000..9892c7da73 --- /dev/null +++ b/releasenotes/notes/mariadb-server-image-be5f77966586ef39.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + ``mariadb`` role uses now mariadb-server image by default (compared to + ``mariadb`` previously), since ``mariadb`` image will be deprecated in + the Kolla Victoria release and removed in Wallaby.