openstack/kolla
Code Issues Proposed changes

CentOS 8: base and openstack-base images

Browse Source 
Adds support to the base and openstack-base images for CentOS 8.
These images have been removed from the list of unbuildable images, and
replaced with all dependent images.

Change-Id: I18fba8a5c2f99b700990cbf41c76077a1ec2408a
Partially-Implements: blueprint centos-rhel-8
This commit is contained in:
Mark Goddard 2019-12-16 17:54:56 +00:00
parent 946749312f
commit 3c618a1f6f
7 changed files with 255 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
docker/base/Dockerfile.j2
View File

@ -42,9 +42,11 @@ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(ho
# enables to provide repo overrides at a later date in a simple fashion if we # enables to provide repo overrides at a later date in a simple fashion if we
# desire such functionality. I think we will :) # desire such functionality. I think we will :)
{# FIXME(mgoddard): Remove special case for CentOS 8 when CentOS 7 is no #}
{# longer supported. #}
RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release); \ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release); \
if [ $CURRENT_DISTRO_RELEASE != "{{ supported_distro_release }}" ]; then \ if [ $CURRENT_DISTRO_RELEASE != "{{ supported_distro_release }}" ] && [ $CURRENT_DISTRO_RELEASE != 8 ]; then \
echo "Only release '{{ supported_distro_release }}' is supported on {{ base_distro }}"; false; \ echo "Only releases '{{ supported_distro_release }}' and '8' are supported on {{ base_distro }}"; false; \
fi \ fi \
&& cat /tmp/kolla_bashrc >> /etc/bashrc \ && cat /tmp/kolla_bashrc >> /etc/bashrc \
&& sed -i 's|^\(override_install_langs=.*\)|# \1|' {% if distro_package_manager == 'dnf' %}/etc/dnf/dnf.conf{% else %}/etc/yum.conf{% endif %} && sed -i 's|^\(override_install_langs=.*\)|# \1|' {% if distro_package_manager == 'dnf' %}/etc/dnf/dnf.conf{% else %}/etc/yum.conf{% endif %}
@ -59,8 +61,22 @@ COPY yum.conf /etc/yum.conf
{% endblock %} {% endblock %}
#### BEGIN REPO ENABLEMENT # Install what is needed for en_US.UTF-8
{% block base_centos_distro_sync_and_languages %}
{% if distro_package_manager == 'dnf' %}
{% set base_centos_language_packages = [
'langpacks-en',
'glibc-all-langpacks'
] %}
RUN {{ macros.install_packages(base_centos_language_packages | customizable("centos_language_packages"), chain=True, clean=False) }} \
&& {{ macros.rpm_security_update(clean_package_cache) }}
{% endif %}
{% endblock %}
#### BEGIN REPO ENABLEMENT
{% set base_yum_repo_files = [ {% set base_yum_repo_files = [
] %} ] %}
@ -72,44 +88,74 @@ COPY yum.conf /etc/yum.conf
{% if base_arch == 'x86_64' %} {% if base_arch == 'x86_64' %}
{% set base_yum_repo_files = [ {% set base_yum_repo_files = [
'crmsh.repo',
'elasticsearch.repo',
'grafana.repo', 'grafana.repo',
'influxdb.repo', 'influxdb.repo',
'opendaylight.repo',
'rabbitmq_rabbitmq-server.repo', 'rabbitmq_rabbitmq-server.repo',
'td.repo'
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
{% set base_yum_repo_files = base_yum_repo_files + [
'crmsh.repo',
'elasticsearch.repo',
'opendaylight.repo',
'td.repo',
] %}
{% endif %}
{% set base_yum_repo_keys = [ {% set base_yum_repo_keys = [
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
'https://packages.grafana.com/gpg.key', 'https://packages.grafana.com/gpg.key',
'https://repos.influxdata.com/influxdb.key', 'https://repos.influxdata.com/influxdb.key',
'https://packagecloud.io/gpg.key', 'https://packagecloud.io/gpg.key',
'https://packages.treasuredata.com/GPG-KEY-td-agent'
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
{% set base_yum_repo_keys = base_yum_repo_keys + [
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
'https://packages.treasuredata.com/GPG-KEY-td-agent',
] %}
{% endif %}
{% elif base_arch == 'aarch64' %} {% elif base_arch == 'aarch64' %}
{% set base_yum_repo_files = [ {% set base_yum_repo_files = [
'elasticsearch.repo',
'grafana.repo', 'grafana.repo',
'rabbitmq_rabbitmq-server.repo' 'rabbitmq_rabbitmq-server.repo',
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
{% set base_yum_repo_files = base_yum_repo_files + [
'elasticsearch.repo',
] %}
{% endif %}
{% set base_yum_repo_keys = [ {% set base_yum_repo_keys = [
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
'https://packages.grafana.com/gpg.key', 'https://packages.grafana.com/gpg.key',
'https://packagecloud.io/gpg.key', 'https://packagecloud.io/gpg.key',
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
{% set base_yum_repo_keys = base_yum_repo_keys + [
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
] %}
{% endif %}
{% elif base_arch == 'ppc64le' %} {% elif base_arch == 'ppc64le' %}
{% set base_yum_repo_files = [ {% set base_yum_repo_files = [
'elasticsearch.repo', 'rabbitmq_rabbitmq-server.repo',
'rabbitmq_rabbitmq-server.repo'
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
{% set base_yum_repo_files = base_yum_repo_files + [
'elasticsearch.repo',
] %}
{% endif %}
{% set base_yum_repo_keys = [ {% set base_yum_repo_keys = [
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
'https://packagecloud.io/gpg.key', 'https://packagecloud.io/gpg.key',
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
{% set base_yum_repo_keys = base_yum_repo_keys + [
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
] %}
{% endif %}
{% endif %} {% endif %}
{%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %} {%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %}
@ -160,40 +206,70 @@ RUN yum-config-manager --enable rhel-7-server-rpms \
{% if base_distro == 'centos' %} {% if base_distro == 'centos' %}
{% block base_centos_gpg_key_import %} {% block base_centos_gpg_key_import %}
{% if distro_package_manager == 'dnf' %}
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
{% else %}
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
{% endif %}
{% endblock %} {% endblock %}
{% set base_centos_yum_repo_keys = [ {% set base_centos_yum_repo_keys = [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
{% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
] %}
{% endif %}
{% set base_centos_yum_repo_packages = [ {% set base_centos_yum_repo_packages = [
'centos-release-ceph-nautilus',
'centos-release-opstools',
'centos-release-qemu-ev',
'epel-release', 'epel-release',
'yum-plugin-priorities'
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
'centos-release-ceph-nautilus',
'centos-release-opstools',
'centos-release-qemu-ev',
] %}
{% endif %}
{% if distro_package_manager == 'dnf' %} {% if distro_package_manager == 'dnf' %}
# We need 'dnf-plugins-core' for 'dnf config-manager'
# We need 'dnf config-manager'
{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [ {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
'dnf-plugins-core' 'dnf-plugins-core'
] %} ] %}
{% set base_centos_yum_repos_to_enable = [
'PowerTools'
] %}
{% else %}
{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
'yum-plugin-priorities',
] %}
{% endif %} {% endif %}
{% set base_centos_yum_repos_to_disable = [ {% set base_centos_yum_repos_to_disable = [
'centos-ceph-nautilus',
'centos-nfs-ganesha28',
'centos-qemu-ev',
'influxdb'
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
'centos-ceph-nautilus',
'centos-nfs-ganesha28',
'centos-qemu-ev',
'influxdb',
] %}
{% endif %}
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \
{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %}
{%- if distro_package_manager == 'dnf' %}
&& dnf config-manager --enable {{ repo }} \
{% else %}
&& yum-config-manager --enable {{ repo }} \
{% endif -%}
{% endfor -%}
{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %} {%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %}
{%- if distro_package_manager == 'dnf' %} {%- if distro_package_manager == 'dnf' %}
&& dnf config-manager --disable {{ repo }} \ && dnf config-manager --disable {{ repo }} \
@ -261,7 +337,11 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
'python' 'python'
] %} ] %}
{% endif %} {% endif %}
{% if distro_package_manager == 'yum' %} {% if distro_package_manager == 'dnf' %}
{% set base_centos_packages = base_centos_packages + [
'util-linux-user',
] %}
{% else %}
{% set base_centos_packages = base_centos_packages + [ {% set base_centos_packages = base_centos_packages + [
'scsi-target-utils', 'scsi-target-utils',
] %} ] %}

2
docker/base/rabbitmq_rabbitmq-server.repo
View File

@ -1,6 +1,6 @@
[rabbitmq_rabbitmq-server] [rabbitmq_rabbitmq-server]
name=rabbitmq_rabbitmq-server name=rabbitmq_rabbitmq-server
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/7/$basearch baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/$releasever/$basearch
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=0 enabled=0

4
docker/macros.j2
View File

@ -19,7 +19,11 @@
{# Be Extra vigilant about introducing any extra whitespace at the {# Be Extra vigilant about introducing any extra whitespace at the
end of the macro for chaining purposes -#} end of the macro for chaining purposes -#}
{% macro rpm_security_update(cleanup) -%} {% macro rpm_security_update(cleanup) -%}
{% if distro_package_manager == 'dnf' -%}
{{ distro_package_manager }} -y distro-sync --security --sec-severity=Important --sec-severity=Critical
{%- else -%}
{{ distro_package_manager }} -y update --security --sec-severity=Important --sec-severity=Critical {{ distro_package_manager }} -y update --security --sec-severity=Important --sec-severity=Critical
{%- endif %}
{%- if cleanup %} \ {%- if cleanup %} \
&& {{ distro_package_manager }} clean all && rm -rf /var/cache/{{ distro_package_manager }}{% endif -%} && {{ distro_package_manager }} clean all && rm -rf /var/cache/{{ distro_package_manager }}{% endif -%}
{%- endmacro %} {%- endmacro %}

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

@ -95,7 +95,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-vitrageclient', 'python3-vitrageclient',
'python3-webob', 'python3-webob',
'python3-zaqarclient', 'python3-zaqarclient',
'util-linux-user'
] %} ] %}
{% else %} {% else %}
{% set openstack_base_packages = openstack_base_packages + [ {% set openstack_base_packages = openstack_base_packages + [
@ -241,10 +240,18 @@ ENV DEBIAN_FRONTEND noninteractive
'openssl-devel', 'openssl-devel',
'postgresql', 'postgresql',
'postgresql-devel', 'postgresql-devel',
'python-devel',
'sqlite-devel', 'sqlite-devel',
'zip' 'zip'
] %} ] %}
{% if distro_python_version.startswith('3') %}
{% set openstack_base_packages = openstack_base_packages + [
'python3-devel',
] %}
{% else %}
{% set openstack_base_packages = openstack_base_packages + [
'python-devel',
] %}
{% endif %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set openstack_base_packages = [ {% set openstack_base_packages = [

26
kolla/common/config.py
View File

@ -13,6 +13,7 @@
import itertools import itertools
import os import os
from distutils.version import LooseVersion
from oslo_config import cfg from oslo_config import cfg
from oslo_config import types from oslo_config import types
@ -33,17 +34,18 @@ DISTRO_RELEASE = {
'debian': '10', 'debian': '10',
'ubuntu': '18.04', 'ubuntu': '18.04',
} }
OPENSTACK_RELEASE = { # NOTE(mgoddard): The default release is set to 'train' for CentOS/RHEL 7 due
'centos': 'train', # to master dropping support for Python 2.
'rhel': 'train', OPENSTACK_RELEASE = 'master'
'debian': 'master',
'ubuntu': 'master',
}
# This is noarch repository so we will use it on all architectures # This is noarch repository so we will use it on all architectures
DELOREAN = \ DELOREAN = \
"https://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo" "https://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo"
DELOREAN_DEPS = "https://trunk.rdoproject.org/centos7/delorean-deps.repo" DELOREAN_DEPS = "https://trunk.rdoproject.org/centos7/delorean-deps.repo"
DELOREAN_CENTOS8 = "https://trunk.rdoproject.org/centos8-master/" \
"consistent/delorean.repo"
DELOREAN_DEPS_CENTOS8 = "https://trunk.rdoproject.org/centos8-master/" \
"delorean-deps.repo"
INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos'] INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
@ -251,7 +253,7 @@ _CLI_OPTS = [
help=('Squash the image layers. WARNING: it will consume lots' help=('Squash the image layers. WARNING: it will consume lots'
' of disk IO. "docker-squash" tool is required, install' ' of disk IO. "docker-squash" tool is required, install'
' it by "pip install docker-squash"')), ' it by "pip install docker-squash"')),
cfg.StrOpt('openstack-release', default='master', cfg.StrOpt('openstack-release', default=OPENSTACK_RELEASE,
help='OpenStack release for building kolla-toolbox'), help='OpenStack release for building kolla-toolbox'),
cfg.StrOpt('openstack-branch', default='master', cfg.StrOpt('openstack-branch', default='master',
help='Branch for source images'), help='Branch for source images'),
@ -1255,7 +1257,15 @@ def parse(conf, args, usage=None, prog=None,
# NOTE(jeffrey4l): set the default base tag based on the # NOTE(jeffrey4l): set the default base tag based on the
# base option # base option
conf.set_default('base_tag', DEFAULT_BASE_TAGS.get(conf.base)) conf.set_default('base_tag', DEFAULT_BASE_TAGS.get(conf.base))
conf.set_default('openstack_release', OPENSTACK_RELEASE.get(conf.base)) # TODO(mgoddard): Remove this 'if' when CentOS 7 is no longer supported.
if conf.base in ['centos', 'rhel']:
if LooseVersion(conf.base_tag) >= LooseVersion('8'):
# Use CentOS 8 Delorean repos.
conf.set_default('rpm_setup_config', [DELOREAN_CENTOS8,
DELOREAN_DEPS_CENTOS8])
else:
# Use Train packages on CentOS 7 due to python 2 drop.
conf.set_default('openstack_release', 'train')
prefix = '' if conf.openstack_release == 'master' else 'stable-' prefix = '' if conf.openstack_release == 'master' else 'stable-'
openstack_branch = '{}{}'.format(prefix, conf.openstack_release) openstack_branch = '{}{}'.format(prefix, conf.openstack_release)
conf.set_default('openstack_branch', openstack_branch) conf.set_default('openstack_branch', openstack_branch)

98
kolla/image/build.py
View File

@ -142,9 +142,103 @@ UNBUILDABLE_IMAGES = {
"ovsdpdk", "ovsdpdk",
}, },
# NOTE(mgoddard): Mark all images unbuildable for CentOS 8. # NOTE(mgoddard): Mark all images that depend on base or openstack-base as
# unbuildable for CentOS 8.
'centos8': { 'centos8': {
"base", "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",
}, },
'debian': { 'debian': {

19
tests/templates/template_overrides.j2
View File

@ -29,13 +29,20 @@ RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow-
RUN sed -i \ RUN sed -i \
-e "/^mirrorlist/ d" \ -e "/^mirrorlist/ d" \
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
/etc/yum.repos.d/CentOS-*.repo \ /etc/yum.repos.d/CentOS-*.repo
&& sed -i \ {% raw %}
{% if distro_package_manager == 'yum' %}
{% endraw %}
# FIXME(mgoddard): No crmsh or openstacklight CentOS 8 repos yet.
RUN sed -i \
-e "s|http://download.opensuse.org|http://{{ nodepool_mirror_host }}/opensuse|" \ -e "s|http://download.opensuse.org|http://{{ nodepool_mirror_host }}/opensuse|" \
/etc/yum.repos.d/crmsh.repo \ /etc/yum.repos.d/crmsh.repo \
&& sed -i \ && sed -i \
-e "s|https://cbs.centos.org/repos|{{ nodepool_cbs_centos_proxy }}|g" \ -e "s|https://cbs.centos.org/repos|{{ nodepool_cbs_centos_proxy }}|g" \
/etc/yum.repos.d/opendaylight.repo /etc/yum.repos.d/opendaylight.repo
{% raw %}
{% endif %}
{% endraw %}
{% raw %} {% raw %}
{% endblock %} {% endblock %}
@ -43,9 +50,16 @@ RUN sed -i \
{% block base_centos_repo_overrides_post_rpm %} {% block base_centos_repo_overrides_post_rpm %}
{% endraw %} {% endraw %}
{% raw %}
{% if distro_package_manager == 'yum' %}
{% endraw %}
# FIXME(mgoddard): No CentOS8 RDO repos mirrored yet.
RUN sed -i \ RUN sed -i \
-e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \ -e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \
/etc/yum.repos.d/delorean*.repo /etc/yum.repos.d/delorean*.repo
{% raw %}
{% endif %}
{% endraw %}
{% raw %} {% raw %}
{% endblock %} {% endblock %}
@ -59,6 +73,7 @@ RUN sed -i \
&& sed -i \ && sed -i \
-e "/^metalink/ d" \ -e "/^metalink/ d" \
-e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \ -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \
-e "s|^#baseurl=https://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \
/etc/yum.repos.d/epel*.repo \ /etc/yum.repos.d/epel*.repo \
{% raw %} {% raw %}
{% endblock %} {% endblock %}