openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Cleanup old MariaDB cruft from override file"

This commit is contained in:
Zuul 2018-03-27 12:00:11 +00:00 committed by Gerrit Code Review
parent eaf6d15d27 8c56f23bec
commit a9444f5f50
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
container-images/tripleo_kolla_template_overrides.j2
View File

@ -83,7 +83,6 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
'python2-msgpack' # EPEL, RDO is python-msgpack
#}
{% set openstack_base_packages_remove = [
'Percona-Server-shared-56',
'libtomcrypt',
'libtommath',
'python2-crypto',
@ -97,13 +96,12 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
'pv' # EPEL
#}
{% set mariadb_packages_remove = [
'MariaDB-Galera-server',
'MariaDB-client',
'percona-xtrabackup',
'pv'
] %}
{% set mariadb_packages_append = ['xinetd', 'pacemaker', 'pacemaker-remote',
'pcs', 'libqb', 'resource-agents'] %}
{% set sensu_client_packages_remove = [
'MariaDB-client',
'ceph-common',
'cyrus-sasl-devel',
'gcc-c++',
@ -112,9 +110,6 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
'python-pymongo',
'ruby-devel'
] %}
{% set mariadb_packages_append = ['mariadb-server', 'mariadb-server-galera', 'xinetd',
'pacemaker', 'pacemaker-remote', 'pcs', 'libqb', 'resource-agents'] %}
{% set sensu_client_packages_append = ['mariadb-server', 'mariadb-server-galera'] %}
# Required for nova migration
{% set nova_compute_packages_append = ['openstack-nova-migration', 'openssh-server'] %}