openstack/tripleo-common
Code Issues Proposed changes

Merge "drop msgpack now that kolla has dropped it as well"

Browse Source
This commit is contained in:
Zuul 2019-03-09 00:03:30 +00:00 committed by Gerrit Code Review
commit 5a2115d517
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
container-images/tripleo_kolla_template_overrides.j2
View File

@ -167,11 +167,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
'python3-vitrageclient',
] %}
{% else %}
{#
'python2-msgpack' # EPEL, RDO is python-msgpack
#}
{% set openstack_base_packages_remove = [
'python2-msgpack',
'python-cloudkittyclient',
'python-magnumclient',
'python-muranoclient',
@ -179,12 +175,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
'python-vitrageclient',
] %}
{% endif %}
# Pick up the proper packages for python2-msgpack
{% if distro_python3 %}
{% set openstack_base_packages_append = ['python3-msgpack', 'openstack-selinux'] %}
{% else %}
{% set openstack_base_packages_append = ['python-msgpack', 'openstack-selinux'] %}
{% endif %}
{% set openstack_base_packages_append = ['openstack-selinux'] %}
# Use mariadb-server-galera and xinetd for galera and clustercheck
{# 'pv' # EPEL