From 5951977eab3865eace96857df52914f41bd90146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Sun, 8 Jul 2018 23:00:27 +0200 Subject: [PATCH] Stop using deprecated rpm package names These packages produce a warning during the installation, we should switch to their new names, usually to be specific about their use of python2. Change-Id: I0a80e822f64222d9a32aabd1fd834bcf794d6320 --- docker/aodh/aodh-base/Dockerfile.j2 | 4 +- docker/cinder/cinder-base/Dockerfile.j2 | 2 +- docker/glance/glance-api/Dockerfile.j2 | 2 +- docker/gnocchi/gnocchi-base/Dockerfile.j2 | 4 +- docker/helm-repository/Dockerfile.j2 | 2 +- docker/ironic/ironic-conductor/Dockerfile.j2 | 4 +- docker/keystone/keystone-base/Dockerfile.j2 | 4 +- docker/neutron/neutron-base/Dockerfile.j2 | 4 +- docker/nova/nova-compute/Dockerfile.j2 | 2 +- docker/nova/nova-libvirt/Dockerfile.j2 | 2 +- docker/openstack-base/Dockerfile.j2 | 48 ++++++++++---------- docker/panko/panko-base/Dockerfile.j2 | 4 +- docker/telegraf/Dockerfile.j2 | 7 +-- docker/vitrage/vitrage-api/Dockerfile.j2 | 2 +- docker/vitrage/vitrage-base/Dockerfile.j2 | 2 +- docker/zun/zun-base/Dockerfile.j2 | 2 +- 16 files changed, 48 insertions(+), 47 deletions(-) diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index 74cc21e065..392b75e23b 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mod_ssl', 'mod_wsgi', 'openstack-aodh-common', - 'python-ldappool' + 'python2-ldappool' ] %} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }} @@ -45,7 +45,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \ 'httpd', 'mod_wsgi', 'mod_ssl', - 'python-ldappool' + 'python2-ldappool' ] %} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }} diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 2fbf24b5bc..8fb1bc5f17 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -34,7 +34,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ceph-common', 'lvm2', 'cryptsetup', - 'qemu-img' + 'qemu-img-ev' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set cinder_base_packages = [ diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 9dcb42c000..23ec04d7bc 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set glance_api_packages = ['qemu-img'] %} + {% set glance_api_packages = ['qemu-img-ev'] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set glance_api_packages = ['qemu-utils'] %} {% endif %} diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 563828e810..52662dba6e 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mod_ssl', 'mod_wsgi', 'openstack-gnocchi-common', - 'python-ldappool', + 'python2-ldappool', 'python2-cradox' ] %} @@ -52,7 +52,7 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages 'librados2-devel', 'mod_ssl', 'mod_wsgi', - 'python-ldappool' + 'python2-ldappool' ] %} # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2 index dfb2ebdc20..45772bcbcf 100644 --- a/docker/helm-repository/Dockerfile.j2 +++ b/docker/helm-repository/Dockerfile.j2 @@ -17,7 +17,7 @@ ENV helm_version=2.3.0 \ {% set helm_repo_packages = [ 'git', 'jq', - 'python-pip' + 'python2-pip' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 470e8abb68..9a658fca5f 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-scciclient', 'python-sushy', 'python-UcsSdk', - 'qemu-img', + 'qemu-img-ev', 'shellinabox', 'systemd-python', 'util-linux', @@ -64,7 +64,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ipmitool', 'parted', 'psmisc', - 'qemu-img', + 'qemu-img-ev', 'shellinabox', 'util-linux', 'xfsprogs', diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 9d65a3cd7c..1c0bad8fd0 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mod_ssl', 'mod_wsgi', 'openstack-keystone', - 'python-ldappool', + 'python2-ldappool', 'python-keystoneclient' ] %} @@ -53,7 +53,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ 'mod_auth_openidc', 'mod_ssl', 'mod_wsgi', - 'python-ldappool' + 'python2-ldappool' ] %} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 9a2c2b3c30..13be3a95f7 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch', 'python-networking-sfc', 'python-networking-vmware-nsx', - 'python-openvswitch', + 'python2-openvswitch', 'python2-oslo-vmware' ] %} @@ -88,7 +88,7 @@ RUN mkdir -p /usr/share/neutron \ 'keepalived', 'net-tools', 'openvswitch', - 'python-openvswitch', + 'python2-openvswitch', 'radvd', 'uuid' ] %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 6138fc3996..bc84b42508 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -78,7 +78,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'parted', 'python-libguestfs', 'python-rtslib', - 'qemu-img', + 'qemu-img-ev', 'sysfsutils', 'targetcli' ] %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 49ab792913..f5de278176 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libvirt-daemon-driver-lxc', 'libvirt-daemon-driver-nwfilter', 'openvswitch', - 'qemu-kvm' + 'qemu-kvm-ev' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index a2b761bbd1..8948233a05 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -30,10 +30,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libyaml', 'MySQL-python', 'openssl', - 'pyOpenSSL', + 'python2-pyOpenSSL', 'pyparsing', - 'python-crypto', - 'python-msgpack', + 'python2-crypto', + 'python2-msgpack', 'python2-cryptography', 'python2-debtcollector', 'python2-eventlet', @@ -60,46 +60,46 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python2-PyMySQL', 'python2-sysv_ipc', 'python2-zake', - 'python-alembic', - 'python-amqp', + 'python2-alembic', + 'python2-amqp', 'python-anyjson', 'python-aodhclient', 'python-barbicanclient', 'python-beaker', - 'python-cachetools', - 'python-cffi', - 'python-cliff', + 'python2-cachetools', + 'python2-cffi', + 'python2-cliff', 'python-cloudkittyclient', 'python-cmd2', 'python-congressclient', 'python-contextlib2', - 'python-dateutil', + 'python2-dateutil', 'python-decorator', 'python-designateclient', 'python-dogpile-cache', 'python-editor', 'python-elasticsearch', 'python-enum34', - 'python-extras', - 'python-fixtures', + 'python2-extras', + 'python2-fixtures', 'python-futures', 'python-glanceclient', 'python-gnocchiclient', 'python-heatclient', 'python-httplib2', - 'python-idna', + 'python2-idna', 'python-inotify', 'python-ipaddress', 'python-ironicclient', - 'python-jsonpatch', - 'python-jsonpointer', + 'python2-jsonpatch', + 'python2-jsonpointer', 'python-jsonschema', 'python-kazoo', 'python-keyring', 'python-keystoneauth1', 'python-keystoneclient', 'python-keystonemiddleware', - 'python-kombu', + 'python2-kombu', 'python-linecache2', 'python-lxml', 'python-magnumclient', @@ -107,11 +107,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-manilaclient', 'python-memcached', 'python-migrate', - 'python-mimeparse', + 'python2-mimeparse', 'python-mistralclient', 'python-monotonic', 'python-muranoclient', - 'python-netaddr', + 'python2-netaddr', 'python-netifaces', 'python-neutronclient', 'python-novaclient', @@ -128,26 +128,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-PyMySQL', 'python-redis', 'python-repoze-lru', - 'python-requests', + 'python2-requests', 'python-retrying', 'python-routes', 'python-saharaclient', - 'python-simplejson', - 'python-sqlalchemy', + 'python2-simplejson', + 'python2-sqlalchemy', 'python-sqlparse', - 'python-stevedore', + 'python2-stevedore', 'python-swiftclient', 'python-tempita', 'python-testtools', 'python-tooz', - 'python-traceback2', + 'python2-traceback2', 'python-troveclient', 'python-unicodecsv', 'python-unittest2', - 'python-urllib3', + 'python2-urllib3', 'python-vitrageclient', 'python-warlock', - 'python-webob', + 'python2-webob', 'python-wrapt', 'python-zaqarclient', 'PyYAML', diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index 1623bf6ffe..7d5ac90d0d 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mod_ssl', 'mod_wsgi', 'openstack-panko-common', - 'python-ldappool' + 'python2-ldappool' ] %} {{ macros.install_packages(panko_base_packages | customizable("packages")) }} @@ -36,7 +36,7 @@ RUN echo > /etc/apache2/ports.conf 'httpd', 'mod_ssl', 'mod_wsgi', - 'python-ldappool' + 'python2-ldappool' ] %} {{ macros.install_packages(panko_base_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 index c228480007..b43f9fed4a 100644 --- a/docker/telegraf/Dockerfile.j2 +++ b/docker/telegraf/Dockerfile.j2 @@ -10,17 +10,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set telegraf_packages = [ 'chrony', 'net-tools', - 'python-pip', 'telegraf' ] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set telegraf_packages = telegraf_packages + [ - 'collectd' + 'collectd', + 'python2-pip' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set telegraf_packages = telegraf_packages + [ - 'collectd-core' + 'collectd-core', + 'python-pip' ] %} {% endif %} diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 index 5a9cae22e1..1d486e8fd1 100644 --- a/docker/vitrage/vitrage-api/Dockerfile.j2 +++ b/docker/vitrage/vitrage-api/Dockerfile.j2 @@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'httpd', 'mod_wsgi', 'mod_ssl', - 'python-ldappool', + 'python2-ldappool', 'openstack-vitrage-api' ] %} diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 index 9d3aba6606..f53bfb5589 100644 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -32,7 +32,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ 'httpd', 'mod_wsgi', 'mod_ssl', - 'python-ldappool' + 'python2-ldappool' ] %} {{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 index 2fbff31e5b..9f502ae9c9 100644 --- a/docker/zun/zun-base/Dockerfile.j2 +++ b/docker/zun/zun-base/Dockerfile.j2 @@ -20,7 +20,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ 'httpd', 'mod_wsgi', 'mod_ssl', - 'python-ldappool' + 'python2-ldappool' ] %} {{ macros.install_packages(zun_base_packages | customizable("packages")) }}