openstack
/
kolla
Code Issues Proposed changes

Merge "Stop using deprecated rpm package names"

This commit is contained in:
Zuul 2018-07-13 11:53:31 +00:00 committed by Gerrit Code Review
parent 3d27352181 5951977eab
commit 74612346b0
16 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/aodh/aodh-base/Dockerfile.j2
View File

@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'openstack-aodh-common', 'openstack-aodh-common',
'python-ldappool' 'python2-ldappool'
] %} ] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
@ -45,7 +45,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
'httpd', 'httpd',
'mod_wsgi', 'mod_wsgi',
'mod_ssl', 'mod_ssl',
'python-ldappool' 'python2-ldappool'
] %} ] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}

2
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -34,7 +34,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ceph-common', 'ceph-common',
'lvm2', 'lvm2',
'cryptsetup', 'cryptsetup',
'qemu-img' 'qemu-img-ev'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set cinder_base_packages = [ {% set cinder_base_packages = [

2
docker/glance/glance-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% 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'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set glance_api_packages = ['qemu-utils'] %} {% set glance_api_packages = ['qemu-utils'] %}
{% endif %} {% endif %}

4
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'openstack-gnocchi-common', 'openstack-gnocchi-common',
'python-ldappool', 'python2-ldappool',
'python2-cradox' 'python2-cradox'
] %} ] %}
@ -52,7 +52,7 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
'librados2-devel', 'librados2-devel',
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'python-ldappool' 'python2-ldappool'
] %} ] %}
# on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le

2
docker/helm-repository/Dockerfile.j2
View File

@ -17,7 +17,7 @@ ENV helm_version=2.3.0 \
{% set helm_repo_packages = [ {% set helm_repo_packages = [
'git', 'git',
'jq', 'jq',
'python-pip' 'python2-pip'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}

4
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-scciclient', 'python-scciclient',
'python-sushy', 'python-sushy',
'python-UcsSdk', 'python-UcsSdk',
'qemu-img', 'qemu-img-ev',
'shellinabox', 'shellinabox',
'systemd-python', 'systemd-python',
'util-linux', 'util-linux',
@ -64,7 +64,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ipmitool', 'ipmitool',
'parted', 'parted',
'psmisc', 'psmisc',
'qemu-img', 'qemu-img-ev',
'shellinabox', 'shellinabox',
'util-linux', 'util-linux',
'xfsprogs', 'xfsprogs',

4
docker/keystone/keystone-base/Dockerfile.j2
View File

@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'openstack-keystone', 'openstack-keystone',
'python-ldappool', 'python2-ldappool',
'python-keystoneclient' 'python-keystoneclient'
] %} ] %}
@ -53,7 +53,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
'mod_auth_openidc', 'mod_auth_openidc',
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'python-ldappool' 'python2-ldappool'
] %} ] %}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \

4
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch', 'openvswitch',
'python-networking-sfc', 'python-networking-sfc',
'python-networking-vmware-nsx', 'python-networking-vmware-nsx',
'python-openvswitch', 'python2-openvswitch',
'python2-oslo-vmware' 'python2-oslo-vmware'
] %} ] %}
@ -88,7 +88,7 @@ RUN mkdir -p /usr/share/neutron \
'keepalived', 'keepalived',
'net-tools', 'net-tools',
'openvswitch', 'openvswitch',
'python-openvswitch', 'python2-openvswitch',
'radvd', 'radvd',
'uuid' 'uuid'
] %} ] %}

2
docker/nova/nova-compute/Dockerfile.j2
View File

@ -78,7 +78,7 @@ RUN rm -f /etc/nova/nova-compute.conf
'parted', 'parted',
'python-libguestfs', 'python-libguestfs',
'python-rtslib', 'python-rtslib',
'qemu-img', 'qemu-img-ev',
'sysfsutils', 'sysfsutils',
'targetcli' 'targetcli'
] %} ] %}

2
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libvirt-daemon-driver-lxc', 'libvirt-daemon-driver-lxc',
'libvirt-daemon-driver-nwfilter', 'libvirt-daemon-driver-nwfilter',
'openvswitch', 'openvswitch',
'qemu-kvm' 'qemu-kvm-ev'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}

48
docker/openstack-base/Dockerfile.j2
View File

@ -30,10 +30,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libyaml', 'libyaml',
'MySQL-python', 'MySQL-python',
'openssl', 'openssl',
'pyOpenSSL', 'python2-pyOpenSSL',
'pyparsing', 'pyparsing',
'python-crypto', 'python2-crypto',
'python-msgpack', 'python2-msgpack',
'python2-cryptography', 'python2-cryptography',
'python2-debtcollector', 'python2-debtcollector',
'python2-eventlet', 'python2-eventlet',
@ -60,46 +60,46 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python2-PyMySQL', 'python2-PyMySQL',
'python2-sysv_ipc', 'python2-sysv_ipc',
'python2-zake', 'python2-zake',
'python-alembic', 'python2-alembic',
'python-amqp', 'python2-amqp',
'python-anyjson', 'python-anyjson',
'python-aodhclient', 'python-aodhclient',
'python-barbicanclient', 'python-barbicanclient',
'python-beaker', 'python-beaker',
'python-cachetools', 'python2-cachetools',
'python-cffi', 'python2-cffi',
'python-cliff', 'python2-cliff',
'python-cloudkittyclient', 'python-cloudkittyclient',
'python-cmd2', 'python-cmd2',
'python-congressclient', 'python-congressclient',
'python-contextlib2', 'python-contextlib2',
'python-dateutil', 'python2-dateutil',
'python-decorator', 'python-decorator',
'python-designateclient', 'python-designateclient',
'python-dogpile-cache', 'python-dogpile-cache',
'python-editor', 'python-editor',
'python-elasticsearch', 'python-elasticsearch',
'python-enum34', 'python-enum34',
'python-extras', 'python2-extras',
'python-fixtures', 'python2-fixtures',
'python-futures', 'python-futures',
'python-glanceclient', 'python-glanceclient',
'python-gnocchiclient', 'python-gnocchiclient',
'python-heatclient', 'python-heatclient',
'python-httplib2', 'python-httplib2',
'python-idna', 'python2-idna',
'python-inotify', 'python-inotify',
'python-ipaddress', 'python-ipaddress',
'python-ironicclient', 'python-ironicclient',
'python-jsonpatch', 'python2-jsonpatch',
'python-jsonpointer', 'python2-jsonpointer',
'python-jsonschema', 'python-jsonschema',
'python-kazoo', 'python-kazoo',
'python-keyring', 'python-keyring',
'python-keystoneauth1', 'python-keystoneauth1',
'python-keystoneclient', 'python-keystoneclient',
'python-keystonemiddleware', 'python-keystonemiddleware',
'python-kombu', 'python2-kombu',
'python-linecache2', 'python-linecache2',
'python-lxml', 'python-lxml',
'python-magnumclient', 'python-magnumclient',
@ -107,11 +107,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-manilaclient', 'python-manilaclient',
'python-memcached', 'python-memcached',
'python-migrate', 'python-migrate',
'python-mimeparse', 'python2-mimeparse',
'python-mistralclient', 'python-mistralclient',
'python-monotonic', 'python-monotonic',
'python-muranoclient', 'python-muranoclient',
'python-netaddr', 'python2-netaddr',
'python-netifaces', 'python-netifaces',
'python-neutronclient', 'python-neutronclient',
'python-novaclient', 'python-novaclient',
@ -128,26 +128,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-PyMySQL', 'python-PyMySQL',
'python-redis', 'python-redis',
'python-repoze-lru', 'python-repoze-lru',
'python-requests', 'python2-requests',
'python-retrying', 'python-retrying',
'python-routes', 'python-routes',
'python-saharaclient', 'python-saharaclient',
'python-simplejson', 'python2-simplejson',
'python-sqlalchemy', 'python2-sqlalchemy',
'python-sqlparse', 'python-sqlparse',
'python-stevedore', 'python2-stevedore',
'python-swiftclient', 'python-swiftclient',
'python-tempita', 'python-tempita',
'python-testtools', 'python-testtools',
'python-tooz', 'python-tooz',
'python-traceback2', 'python2-traceback2',
'python-troveclient', 'python-troveclient',
'python-unicodecsv', 'python-unicodecsv',
'python-unittest2', 'python-unittest2',
'python-urllib3', 'python2-urllib3',
'python-vitrageclient', 'python-vitrageclient',
'python-warlock', 'python-warlock',
'python-webob', 'python2-webob',
'python-wrapt', 'python-wrapt',
'python-zaqarclient', 'python-zaqarclient',
'PyYAML', 'PyYAML',

4
docker/panko/panko-base/Dockerfile.j2
View File

@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'openstack-panko-common', 'openstack-panko-common',
'python-ldappool' 'python2-ldappool'
] %} ] %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }} {{ macros.install_packages(panko_base_packages | customizable("packages")) }}
@ -36,7 +36,7 @@ RUN echo > /etc/apache2/ports.conf
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'python-ldappool' 'python2-ldappool'
] %} ] %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }} {{ macros.install_packages(panko_base_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \

7
docker/telegraf/Dockerfile.j2
View File

@ -10,17 +10,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set telegraf_packages = [ {% set telegraf_packages = [
'chrony', 'chrony',
'net-tools', 'net-tools',
'python-pip',
'telegraf' 'telegraf'
] %} ] %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set telegraf_packages = telegraf_packages + [ {% set telegraf_packages = telegraf_packages + [
'collectd' 'collectd',
'python2-pip'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set telegraf_packages = telegraf_packages + [ {% set telegraf_packages = telegraf_packages + [
'collectd-core' 'collectd-core',
'python-pip'
] %} ] %}
{% endif %} {% endif %}

2
docker/vitrage/vitrage-api/Dockerfile.j2
View File

@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'httpd', 'httpd',
'mod_wsgi', 'mod_wsgi',
'mod_ssl', 'mod_ssl',
'python-ldappool', 'python2-ldappool',
'openstack-vitrage-api' 'openstack-vitrage-api'
] %} ] %}

2
docker/vitrage/vitrage-base/Dockerfile.j2
View File

@ -32,7 +32,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
'httpd', 'httpd',
'mod_wsgi', 'mod_wsgi',
'mod_ssl', 'mod_ssl',
'python-ldappool' 'python2-ldappool'
] %} ] %}
{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} {{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}

2
docker/zun/zun-base/Dockerfile.j2
View File

@ -20,7 +20,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
'httpd', 'httpd',
'mod_wsgi', 'mod_wsgi',
'mod_ssl', 'mod_ssl',
'python-ldappool' 'python2-ldappool'
] %} ] %}
{{ macros.install_packages(zun_base_packages | customizable("packages")) }} {{ macros.install_packages(zun_base_packages | customizable("packages")) }}