openstack
/
tripleo-common
Code Issues Proposed changes

drop python-crypto changes from overrides 

Dropping python2-crypto from kolla, let's remove from overrides as well

Depends-On: Ie0f426fbe396ed9b5a3b86406c64e12e87dd81a7
Change-Id: I41d60f68e0329b536f772787c9f2637002cb895f
This commit is contained in:
Jon Schlueter 2019-02-01 13:17:54 -05:00
parent fe8dd5c907
commit df12db5d3e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container-images/tripleo_kolla_template_overrides.j2
View File

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