diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-04-20 15:13:31 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-05-17 13:02:14 +0000 |
| commit | bd21ac14d73e01c97a780ec8c12fb99e0b8c4b10 (patch) | |
| tree | 1c836dbeec127891a51084f05b052a7bd99fa4cb /docker/qdrouterd | |
| parent | 4c8863b0a877a00a810dab55be818163aeb83c61 (diff) | |
| download | kolla-bd21ac14d73e01c97a780ec8c12fb99e0b8c4b10.tar.gz kolla-bd21ac14d73e01c97a780ec8c12fb99e0b8c4b10.zip | |
switch to official CentOS 8 repositories
RDO builds of stable/train for CentOS 8 went into phase when we do not
need to use delorean builds.
EPEL is disabled like it is in Ussuri (RDO packages may conflict with
it).
Erlang for RabbitMQ is used from CentOS 8 'rabbitmq-38' repo while
RabbitMQ is still 3.7.* from same place as usual.
'python3-pika' is dropped from openstack-base as it is EPEL only package
and is not used by any image (dropped in Ussuri in
https://review.opendev.org/#/c/710003/ patch)
AArch64 is not supported until CentOS 8.2 release.
Change-Id: I9d3ed54f4d10ef7ad2d52ed3aeca15f3968cd163
Diffstat (limited to 'docker/qdrouterd')
| -rw-r--r-- | docker/qdrouterd/Dockerfile.j2 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docker/qdrouterd/Dockerfile.j2 b/docker/qdrouterd/Dockerfile.j2 index 01ba0ef04..1a0454125 100644 --- a/docker/qdrouterd/Dockerfile.j2 +++ b/docker/qdrouterd/Dockerfile.j2 @@ -16,10 +16,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'qpid-dispatch-tools' ] %} -# FIXME(mgoddard): centos-release-opstools not installed on CentOS 8 currently. -{% if base_distro in ['centos'] and distro_package_manager == 'yum' %} +{% if base_distro in ['centos'] %} # make sure qpid is pulled from centos-openstack-RELEASE (RDO) repo -RUN {% if distro_package_manager == 'dnf' %}dnf config-manager{% else %}yum-config-manager{% endif %} --disable epel centos-release-opstools extras +{% if distro_package_manager == 'dnf' %} +RUN dnf config-manager --disable epel centos-opstools extras +{% else %} +RUN yum-config-manager --disable epel centos-release-opstools extras +{% endif %} {% endif %} {{ macros.install_packages(qdrouterd_packages | customizable("packages")) }} |