openstack
/
tripleo-common
Code Issues Proposed changes

Fixup EPEL comments 

when attempeting certain calls to kolla --template-only
jinja2 would fail with

jinja2.exceptions.TemplateSyntaxError: unexpected char u'#' at 2123

https://stackoverflow.com/questions/13562222/jinja2-inline-comments
http://jinja.pocoo.org/docs/2.9/templates/#comments

Related to: I0aac6c48371b66fd1866fee61a9ee7d83d4fc56d

Change-Id: I941f1b1d7214c80d562a17fa77387a23d7ce7064
This commit is contained in:
Jon Schlueter 2017-07-28 14:15:30 -04:00
parent 9ec6d5b111
commit f099e3c65c
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
container-images/tripleo_kolla_template_overrides.j2
View File

@ -42,22 +42,31 @@
{% set neutron_server_packages_append = ['httpd', 'mod_ssl'] %}
# Remove packages not present in repos
#
{# 'libtomcrypt', # EPEL, Unknown use
'libtommath', # EPEL, Unknown use
'python2-crypto', # EPEL, RDO is python-crypto
'python2-msgpack' # EPEL, RDO is python-msgpack
#}
{% set openstack_base_packages_remove = [
'Percona-Server-shared-56',
'libtomcrypt', # EPEL, Unknown use
'libtommath', # EPEL, Unknown use
'python2-crypto', # EPEL, RDO is python-crypto
'python2-msgpack' # EPEL, RDO is python-msgpack
'libtomcrypt',
'libtommath',
'python2-crypto',
'python2-msgpack'
] %}
# Pick up the proper packages for python2-crypto and python2-msgpack
{% set openstack_base_packages_append = ['python-crypto', 'python-msgpack'] %}
# Use mariadb-server-galera and xinetd for galera and clustercheck
{# 'percona-xtrabackup', # EPEL
'pv' # EPEL
#}
{% set mariadb_packages_remove = [
'MariaDB-Galera-server',
'MariaDB-client',
'percona-xtrabackup', # EPEL
'pv' # EPEL
'percona-xtrabackup',
'pv'
] %}
{% set mariadb_packages_append = ['mariadb-server', 'mariadb-server-galera', 'xinetd'] %}