From 0c6312968214e403b5a408d69df17bd0a9267095 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Wed, 12 Feb 2020 09:51:02 +0100 Subject: Use StorageSIG repos for Ceph in CentOS8 Storage SIG has built Ceph Nautilus and Ganesha for CentOS8 in CentOS Build System. Let's switch to use them in kolla. Change-Id: Id37dca84c4eb918aaf2d3c036ef5387fe75988dd --- docker/nova/nova-compute/Dockerfile.j2 | 7 +------ docker/nova/nova-libvirt/Dockerfile.j2 | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'docker/nova') diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index d95f2f2b6..ec6157d33 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -7,12 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -# 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 %} +{{ macros.enable_extra_repos(['ceph']) }} {% 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 080085678..7b674cc3a 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -9,12 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='nova', groups='qemu') }} -# 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 %} +{{ macros.enable_extra_repos(['ceph']) }} {% if base_package_type == 'rpm' %} -- cgit v1.2.3