Merge "drop msgpack now that kolla has dropped it as well"
This commit is contained in:
commit
5a2115d517
|
@ -167,11 +167,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
|
||||||
'python3-vitrageclient',
|
'python3-vitrageclient',
|
||||||
] %}
|
] %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{#
|
|
||||||
'python2-msgpack' # EPEL, RDO is python-msgpack
|
|
||||||
#}
|
|
||||||
{% set openstack_base_packages_remove = [
|
{% set openstack_base_packages_remove = [
|
||||||
'python2-msgpack',
|
|
||||||
'python-cloudkittyclient',
|
'python-cloudkittyclient',
|
||||||
'python-magnumclient',
|
'python-magnumclient',
|
||||||
'python-muranoclient',
|
'python-muranoclient',
|
||||||
|
@ -179,12 +175,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
|
||||||
'python-vitrageclient',
|
'python-vitrageclient',
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
# Pick up the proper packages for python2-msgpack
|
{% set openstack_base_packages_append = ['openstack-selinux'] %}
|
||||||
{% if distro_python3 %}
|
|
||||||
{% set openstack_base_packages_append = ['python3-msgpack', 'openstack-selinux'] %}
|
|
||||||
{% else %}
|
|
||||||
{% set openstack_base_packages_append = ['python-msgpack', 'openstack-selinux'] %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
# Use mariadb-server-galera and xinetd for galera and clustercheck
|
# Use mariadb-server-galera and xinetd for galera and clustercheck
|
||||||
{# 'pv' # EPEL
|
{# 'pv' # EPEL
|
||||||
|
|
Loading…
Reference in New Issue