From ad7a0f0dcf594fce8c92915b0040ec18eb024d50 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 4 Feb 2020 19:18:10 +0100 Subject: CentOS 8: Enable hacluster and masakari images CentOS 8.1 came with HA repo. So we can use it. hacluster-pcs image is disabled as we lack 'crmsh' package for it. Partially-Implements: blueprint centos-rhel-8 Co-Authored-By: Mark Goddard Change-Id: I1c786eda399eca4464c9d68ac040c2965350f775 (cherry picked from commit 92224ccb518c90d7c269158d074d811aee2f05f0) --- docker/base/Dockerfile.j2 | 1 + kolla/image/build.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 624e46d85..efe219627 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -244,6 +244,7 @@ COPY ceph.repo /etc/yum.repos.d/ 'dnf-plugins-core' ] %} {% set base_centos_yum_repos_to_enable = [ + 'HighAvailability', 'PowerTools' ] %} {% else %} diff --git a/kolla/image/build.py b/kolla/image/build.py index 2bf968505..1ca2393d3 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -150,7 +150,7 @@ UNBUILDABLE_IMAGES = { "dind", # Dropped in master "dragonflow-base", # Dropped in master "elasticsearch", # Missing elasticsearch repo - "hacluster-base", # Missing hacluster repo + "hacluster-pcs", # Missing crmsh package "helm-repository", # Dropped in master "kibana", # Missing elasticsearch repo "kube-base", # Dropped in master @@ -169,7 +169,6 @@ UNBUILDABLE_IMAGES = { "bifrost-base", # Bifrost does not support CentOS 8 "cyborg-agent", # opae-sdk does not support CentOS 8 "freezer-base", # Missing package trickle - "masakari-monitors", # Missing hacluster repo }, 'debian': { -- cgit v1.2.3