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 --- kolla/image/build.py | 7 ------- kolla/template/repos.yaml | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'kolla') diff --git a/kolla/image/build.py b/kolla/image/build.py index ef5dcea19..ec9ce816f 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -146,19 +146,13 @@ UNBUILDABLE_IMAGES = { # CentOS 8. 'centos8': { "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 "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 @@ -171,7 +165,6 @@ UNBUILDABLE_IMAGES = { "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': { diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 0ea8a4bdd..c3428ae49 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -28,7 +28,12 @@ centos-ppc64le: nfs-ganesha: "centos-nfs-ganesha28" rabbitmq: "rabbitmq_rabbitmq-server" +# TODO(mnasiadka): Rework the repo list once Ceph Octopus is released centos8: + ceph: "ceph" + ceph-noarch: "ceph-noarch" + ceph-el8: "ceph-el8" + ceph-lab-extras: "ceph-lab-extras" grafana: "grafana" influxdb: "influxdb" rabbitmq: "rabbitmq_rabbitmq-server" -- cgit v1.2.3