openstack
/
tripleo-common
Code Issues Proposed changes

mariadb: stop requiring extra package mariadb-server-utils 

mariadb 10.3 ships mysql_upgrade in mariadb-server-utils.
Since I1a450736721863b91be1ea3d3c8948990de9fdeb, mariadb
Kolla image includes that package by default in Stein, so we
no longer need to install it in tripleo's template override.

Change-Id: I4936d9ea3570a924ba1e83302f5e085cb44ee4e8
This commit is contained in:
Damien Ciabrini 2019-03-21 17:55:28 +01:00
parent 9c8aa31ba3
commit 2852b3064a
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
container-images/tripleo_kolla_template_overrides.j2
View File

@ -437,12 +437,6 @@ RUN mkdir /etc/libqb
{% endblock %}
{% block mariadb_footer %}
# When transitioning from mariadb 10.1 to 10.3, mysql_upgrade is now
# shipped in mariadb-server-utils, so check whether we need that package
# until we switch to 10.3.
RUN if yum list available mariadb-server-utils; then yum install -y mariadb-server-utils && \
yum clean all && rm -rf /var/cache/yum ; fi
# We'll configure mariadb with galera.cnf.
# Note: in mariadb 10.3, auth_gssapi.cnf is shipped in optional
# mariadb-gssapi-server. We don't install it here, so force rm