From 70423f19596f92ed01c89e7d62f8c46a6dba6a23 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 27 Jan 2020 14:57:57 +0000 Subject: CentOS 8: Use upstream Ceph/master The only Ceph version that will support CentOS 8 is Octopus. It will be released end of March 2020 - so for now let's use master. Change-Id: I5955acb41e7346802d76f4f2b244cbf5c36f5bf2 Partially-Implements: blueprint centos-rhel-8 --- docker/nova/nova-compute/Dockerfile.j2 | 7 ++++++- docker/nova/nova-libvirt/Dockerfile.j2 | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'docker/nova') diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index ff41c0fbe..36083fe4e 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -5,7 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['ceph']) }} +# FIXME(mnasiadka): Remove when CentOS Storage SIG repo is available for CentOS 8 +{% if distro_package_manager == 'dnf' %} + {{ macros.enable_extra_repos(['ceph', 'ceph-noarch', 'ceph-el8', 'ceph-lab-extras']) }} +{% else %} + {{ macros.enable_extra_repos(['ceph']) }} +{% endif %} {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 293020d60..8d0cb20d6 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -7,7 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='nova', groups='qemu') }} -{{ macros.enable_extra_repos(['ceph']) }} +# FIXME(mnasiadka): Remove when CentOS Storage SIG repo is available for CentOS 8 +{% if distro_package_manager == 'dnf' %} + {{ macros.enable_extra_repos(['ceph', 'ceph-noarch', 'ceph-el8', 'ceph-lab-extras']) }} +{% else %} + {{ macros.enable_extra_repos(['ceph']) }} +{% endif %} {% if base_package_type == 'rpm' %} -- cgit v1.2.3