openstack
/
tripleo-common
Code Issues Proposed changes

Merge "[EL9] Switch to mariadb:10.5 module"

This commit is contained in:
Zuul 2021-10-14 22:51:11 +00:00 committed by Gerrit Code Review
parent d36e0d184c 031ba553e4
commit 07b030c059
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/tcib/base/base.yaml
View File

@ -75,7 +75,7 @@ tcib_packages:
- disable: container-tools:rhel8
- disable: virt:rhel
- enable: container-tools:{{ tcib_rhel_modules['container-tools'] | default('latest' if tcib_release is version('9', '==') else '3.0') }}
- enable: mariadb:{{ tcib_rhel_modules['mariadb'] | default('10.3') }}
- enable: mariadb:{{ tcib_rhel_modules['mariadb'] | default('10.5' if tcib_release is version('9', '==') else '10.3') }}
- enable: virt:{{ tcib_rhel_modules['virt'] | default('av') }}
- enable: redis:{{ tcib_rhel_modules['redis'] | default('5') }}
tcib_stopsignal: SIGTERM

2
container-images/tcib/base/mariadb/mariadb.yaml
View File

@ -3,7 +3,7 @@ tcib_actions:
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- run: cp /usr/share/openstack-tripleo-common-containers/container-images/kolla/mariadb/extend_start.sh /usr/local/bin/kolla_extend_start
- run: chmod 755 /usr/local/bin/kolla_extend_start
- run: cp /usr/share/openstack-tripleo-common-containers/container-images/kolla/mariadb/security_reset.expect /usr/local/bin/kolla_security_reset
- run: cp /usr/share/openstack-tripleo-common-containers/container-images/kolla/mariadb/security_reset.expect{{ tcib_release is version('8', '==') | ternary('', '.10.5') }} /usr/local/bin/kolla_security_reset
- run: chmod 755 /usr/local/bin/kolla_security_reset
- run: rm -rf /var/lib/mysql/* /etc/my.cnf.d/mariadb-server.cnf /etc/my.cnf.d/auth_gssapi.cnf
- run: mkdir -p /etc/libqb