Merge "Change mariadb image to mariadb-server"

This commit is contained in:
Zuul 2020-09-17 16:53:21 +00:00 committed by Gerrit Code Review
commit 90e4795f50
2 changed files with 7 additions and 1 deletions

View File

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

View File

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