From df12db5d3e01c4f9c964724fbc076f1453399761 Mon Sep 17 00:00:00 2001 From: Jon Schlueter Date: Fri, 1 Feb 2019 13:17:54 -0500 Subject: [PATCH] drop python-crypto changes from overrides Dropping python2-crypto from kolla, let's remove from overrides as well Depends-On: Ie0f426fbe396ed9b5a3b86406c64e12e87dd81a7 Change-Id: I41d60f68e0329b536f772787c9f2637002cb895f --- container-images/tripleo_kolla_template_overrides.j2 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index ff41dd5a3..957496201 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -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