openstack/kolla
Code Issues Proposed changes

Merge "CentOS 8: Update packages in images"

Browse Source
This commit is contained in:
Zuul 2020-01-30 20:13:03 +00:00 committed by Gerrit Code Review
commit e97239f03e
18 changed files with 165 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/ceilometer/ceilometer-compute/Dockerfile.j2
View File

@ -20,9 +20,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set ceilometer_compute_packages = [
'libvirt-python'
] %}
{% if distro_python_version.startswith('3') %}
{% set ceilometer_compute_packages = [
'python3-libvirt'
] %}
{% else %}
{% set ceilometer_compute_packages = [
'libvirt-python'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set ceilometer_compute_packages = [
'python3-libvirt'

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

@ -50,13 +50,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'lvm2',
'cryptsetup',
] %}
{% if base_distro in ['centos'] %}
{% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %}
{% set cinder_base_packages = cinder_base_packages + [
'qemu-img-ev'
'qemu-img'
] %}
{% else %}
{% set cinder_base_packages = cinder_base_packages + [
'qemu-img'
'qemu-img-ev'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}

1
docker/cinder/cinder-volume/Dockerfile.j2
View File

@ -12,7 +12,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'sysfsutils',
'targetcli'
] %}
{% if distro_python_version.startswith('3') %}
{% set cinder_volume_packages = cinder_volume_packages + [
'python3-rtslib',

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

@ -5,10 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if base_distro in ['centos'] %}
{% set glance_api_packages = ['qemu-img-ev'] %}
{% elif base_distro == 'rhel' %}
{% if base_package_type == 'rpm' %}
{% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %}
{% set glance_api_packages = ['qemu-img'] %}
{% else %}
{% set glance_api_packages = ['qemu-img-ev'] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set glance_api_packages = ['qemu-utils'] %}
{% endif %}

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

@ -49,13 +49,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'systemd-python'
] %}
{% endif %}
{% if base_distro in ['centos'] %}
{% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'qemu-img-ev'
'qemu-img'
] %}
{% else %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'qemu-img'
'qemu-img-ev'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
@ -92,7 +92,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ipmitool',
'parted',
'psmisc',
'qemu-img-ev',
'shellinabox',
'util-linux',
'xfsprogs',
@ -106,6 +105,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'systemd',
] %}
{% endif %}
{% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'qemu-img'
] %}
{% else %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'qemu-img-ev'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set ironic_conductor_packages = [
'bsdmainutils',

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

@ -31,6 +31,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% endif %}
{% if distro_package_manager == 'dnf' %}
RUN dnf module enable mod_auth_openidc -y
{% endif %}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
@ -76,6 +80,10 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
] %}
{% endif %}
{% if distro_package_manager == 'dnf' %}
RUN dnf module enable mod_auth_openidc -y
{% endif %}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf

15
docker/kolla-toolbox/Dockerfile.j2
View File

@ -30,9 +30,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'mariadb-devel',
'openssh-clients',
'openssl-devel',
'python-devel',
'rabbitmq-server-3.7.10',
] %}
{% if distro_package_manager == 'dnf' %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'python3-devel',
'rabbitmq-server-3.7.*'
] %}
{% else %}
# NOTE(mandre) Remove rabbitmq-server pinning once package dependencies are met
# https://bugs.launchpad.net/kolla/+bug/1814233
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'python-devel',
'rabbitmq-server-3.7.10'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set kolla_toolbox_packages = [

6
docker/kuryr/kuryr-libnetwork/Dockerfile.j2
View File

@ -14,9 +14,13 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% if base_package_type == 'rpm' %}
{% set kuryr_libnetwork_packages = [
'bridge-utils',
'openvswitch'
] %}
{% if distro_package_manager == 'yum' %}
{% set kuryr_libnetwork_packages = kuryr_libnetwork_packages + [
'bridge-utils',
] %}
{% endif %}
{% elif base_package_type == 'deb' %}

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

@ -83,14 +83,23 @@ RUN mkdir -p /usr/share/neutron \
'dnsmasq-utils',
'haproxy',
'ipset',
'iptables',
'iputils',
'keepalived',
'net-tools',
'openvswitch',
'python2-openvswitch',
'radvd',
'uuid'
] %}
{% if distro_python_version.startswith('3') %}
{% set neutron_base_packages = neutron_base_packages + [
'python3-openvswitch',
] %}
{% else %}
{% set neutron_base_packages = neutron_base_packages + [
'python2-openvswitch',
] %}
{% endif %}
{% elif base_package_type == 'deb' %}

6
docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
View File

@ -25,9 +25,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif install_type == 'source' %}
{% set neutron_linuxbridge_agent_packages = [
'bridge-utils',
'ebtables'
] %}
{% if distro_package_manager != 'dnf' %}
{% set neutron_linuxbridge_agent_packages = neutron_linuxbridge_agent_packages + [
'bridge-utils',
] %}
{% endif %}
{% endif %}

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

@ -83,18 +83,36 @@ RUN rm -f /etc/nova/nova-compute.conf
'e2fsprogs',
'genisoimage',
'iscsi-initiator-utils',
'libvirt-python',
'libosinfo',
'nfs-utils',
'openvswitch',
'parted',
'python-libguestfs',
'python-rtslib',
'qemu-img-ev',
'sysfsutils',
'targetcli',
'xfsprogs'
] %}
{% if distro_python_version.startswith('3') %}
{% set nova_compute_packages = nova_compute_packages + [
'python3-libguestfs',
'python3-libvirt',
'python3-rtslib'
] %}
{% else %}
{% set nova_compute_packages = nova_compute_packages + [
'libvirt-python',
'python-libguestfs',
'python-rtslib'
] %}
{% endif %}
{% if distro_package_manager == 'dnf' %}
{% set nova_compute_packages = nova_compute_packages + [
'qemu-img',
] %}
{% else %}
{% set nova_compute_packages = nova_compute_packages + [
'qemu-img-ev',
] %}
{% endif %}
{% elif base_package_type == 'deb' %}

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

@ -18,18 +18,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libvirt-client',
'libvirt-daemon',
'libvirt-daemon-config-nwfilter',
'libvirt-daemon-driver-lxc',
'libvirt-daemon-driver-nwfilter',
'openvswitch',
'trousers'
] %}
{% if base_distro in ['centos'] %}
{% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'qemu-kvm-ev'
'qemu-kvm'
] %}
{% else %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'qemu-kvm'
'qemu-kvm-ev'
] %}
{% endif %}
{% if distro_package_manager != 'dnf' %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'libvirt-daemon-driver-lxc',
] %}
{% endif %}

11
docker/nova/nova-spicehtml5proxy/Dockerfile.j2
View File

@ -36,10 +36,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set nova_spicehtml5proxy_packages = [
'numpy',
'spice-html5'
] %}
{% if distro_python_version.startswith('3') %}
{% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [
'python3-numpy',
] %}
{% else %}
{% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [
'numpy',
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set nova_spicehtml5proxy_packages = [

14
docker/rabbitmq/Dockerfile.j2
View File

@ -11,13 +11,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block rabbitmq_install %}
{% if base_package_type == 'rpm' %}
# NOTE(mandre) Remove rabbitmq-server pinning once package dependencies are met
# https://bugs.launchpad.net/kolla/+bug/1814233
{% set rabbitmq_packages = [
'erlang-hipe',
'hostname',
'rabbitmq-server-3.7.10'
] %}
{% if distro_package_manager == 'dnf' %}
{% set rabbitmq_packages = rabbitmq_packages + [
'rabbitmq-server-3.7.*'
] %}
{% else %}
# NOTE(mandre) Remove rabbitmq-server pinning once package dependencies are met
# https://bugs.launchpad.net/kolla/+bug/1814233
{% set rabbitmq_packages = rabbitmq_packages + [
'rabbitmq-server-3.7.10'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set rabbitmq_packages = [

126
kolla/image/build.py
View File

@ -143,103 +143,37 @@ UNBUILDABLE_IMAGES = {
"ovsdpdk",
},
# NOTE(mgoddard): Mark all images that depend on base or openstack-base as
# unbuildable for CentOS 8.
# NOTE(mgoddard): Mark images with missing dependencies as unbuildable for
# CentOS 8.
'centos8': {
"aodh-base",
"barbican-base",
"bifrost-base",
"blazar-base",
"ceilometer-base",
"ceph-base",
"certmonger",
"chrony",
"cinder-base",
"cloudkitty-base",
"collectd",
"congress-base",
"cron",
"cyborg-base",
"designate-base",
"dnsmasq",
"ec2-api",
"elasticsearch",
"elasticsearch-curator",
"etcd",
"fluentd",
"freezer-base",
"glance-base",
"gnocchi-base",
"grafana",
"hacluster-base",
"haproxy",
"heat-base",
"horizon",
"influxdb",
"ironic-base",
"ironic-inspector",
"iscsid",
"kafka",
"karbor-base",
"keepalived",
"keystone-base",
"kibana",
"kolla-toolbox",
"kuryr-base",
"logstash",
"magnum-base",
"manila-base",
"mariadb",
"masakari-base",
"memcached",
"mistral-base",
"monasca-base",
"monasca-grafana",
"monasca-thresh",
"mongodb",
"multipathd",
"murano-base",
"networking-baremetal",
"neutron-base",
"nova-base",
"nova-libvirt",
"novajoin-base",
"octavia-base",
"opendaylight",
"openvswitch-base",
"ovn-base",
"ovsdpdk",
"panko-base",
"placement-base",
"prometheus-base",
"ptp",
"qdrouterd",
"qinling-base",
"rabbitmq",
"radvd",
"rally",
"redis-base",
"rsyslog-base",
"sahara-base",
"searchlight-base",
"senlin-base",
"sensu-base",
"skydive-base",
"solum-base",
"storm",
"swift-base",
"tacker-base",
"telegraf",
"tempest",
"tgtd",
"tripleoclient",
"trove-base",
"vitrage-base",
"vmtp",
"watcher-base",
"zaqar-base",
"zookeeper",
"zun-base",
"ceph-base", # Missing Ceph repo
"cinder-base", # Missing Ceph repo
"collectd", # Missing collectd-ping and
# collectd-sensubility packages
"elasticsearch", # Missing elasticsearch repo
"glance-base", # Missing Ceph repo
"gnocchi-base", # Missing Ceph repo
"hacluster-base", # Missing hacluster repo
"ironic-conductor", # Missing shellinabox package
"kibana", # Missing elasticsearch repo
"manila-share", # Missing Ceph repo
"mongodb", # Missing mongodb and mongodb-server packages
"monasca-grafana", # Using python2
"nova-compute", # Missing Ceph repo
"nova-libvirt", # Missing Ceph repo
"nova-spicehtml5proxy", # Missing spicehtml5 package
"opendaylight", # Missing opendaylight repo
"ovsdpdk", # Not supported on CentOS
"sensu-base", # Missing sensu package
"tgtd", # Not supported on CentOS 8
},
'centos8+source': {
"bifrost-base", # Bifrost does not support CentOS 8
"cyborg-agent", # opae-sdk does not support CentOS 8
"freezer-base", # Missing package trickle
"masakari-monitors", # Missing hacluster repo
"zun-compute", # Missing Ceph repo
},
'debian': {

4
kolla/template/methods.py
View File

@ -99,6 +99,10 @@ def handle_repos(context, reponames, mode):
base_arch = context.get('base_arch')
distro_package_manager = context.get('distro_package_manager')
# TODO(mgoddard): Remove this when CentOS 7 support is no longer present.
if base_distro == 'centos' and distro_package_manager == 'dnf':
base_distro = 'centos8'
commands = ''
try:

9
kolla/template/repos.yaml
View File

@ -1,4 +1,5 @@
---
# TODO(mgoddard): Remove this when CentOS 7 support is no longer present.
centos:
ceph: "centos-ceph-nautilus"
elasticsearch: "elasticsearch-kibana-logstash-5.x"
@ -14,6 +15,7 @@ centos:
rabbitmq: "rabbitmq_rabbitmq-server"
td-agent: "treasuredata"
# TODO(mgoddard): Remove this when CentOS 7 support is no longer present.
centos-aarch64:
ceph: "centos-ceph-nautilus"
elasticsearch: "elasticsearch-kibana-logstash-5.x"
@ -25,6 +27,7 @@ centos-aarch64:
opstools: "centos-release-opstools"
rabbitmq: "rabbitmq_rabbitmq-server"
# TODO(mgoddard): Remove this when CentOS 7 support is no longer present.
centos-ppc64le:
ceph: "centos-ceph-nautilus"
elasticsearch: "elasticsearch-kibana-logstash-5.x"
@ -34,6 +37,12 @@ centos-ppc64le:
opstools: "centos-release-opstools"
rabbitmq: "rabbitmq_rabbitmq-server"
centos8:
grafana: "grafana"
influxdb: "influxdb"
rabbitmq: "rabbitmq_rabbitmq-server"
td-agent: "treasuredata"
# NOTE(hrw): empty dict to avoid TypeError
rhel: {}

2
tests/templates/template_overrides.j2
View File

@ -33,7 +33,7 @@ RUN sed -i \
{% raw %}
{% if distro_package_manager == 'yum' %}
{% endraw %}
# FIXME(mgoddard): No crmsh or openstacklight CentOS 8 repos yet.
# FIXME(mgoddard): No crmsh or opendaylight CentOS 8 repos yet.
RUN sed -i \
-e "s|http://download.opensuse.org|http://{{ nodepool_mirror_host }}/opensuse|" \
/etc/yum.repos.d/crmsh.repo \