From 92224ccb518c90d7c269158d074d811aee2f05f0 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 --- docker/hacluster/hacluster-base/Dockerfile.j2 | 2 ++ docker/hacluster/hacluster-pcs/Dockerfile.j2 | 2 -- docker/masakari/masakari-monitors/Dockerfile.j2 | 2 +- kolla/image/build.py | 3 +-- kolla/template/repos.yaml | 1 + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/hacluster/hacluster-base/Dockerfile.j2 b/docker/hacluster/hacluster-base/Dockerfile.j2 index 26fc3fd70..6dfbc822e 100644 --- a/docker/hacluster/hacluster-base/Dockerfile.j2 +++ b/docker/hacluster/hacluster-base/Dockerfile.j2 @@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['hacluster']) }} + COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/hacluster/hacluster-pcs/Dockerfile.j2 b/docker/hacluster/hacluster-pcs/Dockerfile.j2 index bb7d92a6c..4486fa72f 100644 --- a/docker/hacluster/hacluster-pcs/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pcs/Dockerfile.j2 @@ -7,8 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['hacluster']) }} - {% set hacluster_pcs_packages = ['pcs','crmsh'] %} {{ macros.install_packages(hacluster_pcs_packages | customizable("packages")) }} diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index b0856d1dd..d7098f737 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.configure_user(name='masakari') }} +{{ macros.enable_extra_repos(['hacluster']) }} {% if install_type == 'binary' %} diff --git a/kolla/image/build.py b/kolla/image/build.py index f7906dce5..fed657ef9 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -142,7 +142,7 @@ UNBUILDABLE_IMAGES = { # CentOS 8. 'centos8': { "elasticsearch", # Missing elasticsearch repo - "hacluster-base", # Missing hacluster repo + "hacluster-pcs", # Missing crmsh package "kibana", # Missing elasticsearch repo "mongodb", # Missing mongodb and mongodb-server packages "monasca-grafana", # Using python2 @@ -156,7 +156,6 @@ UNBUILDABLE_IMAGES = { 'centos8+source': { "cyborg-agent", # opae-sdk does not support CentOS 8 "freezer-base", # Missing package trickle - "masakari-monitors", # Missing hacluster repo }, 'debian': { diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index a1d39dc5e..05cb75d52 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -44,6 +44,7 @@ centos8: epel: "epel" epel-modular: "epel-modular" grafana: "grafana" + hacluster: "HighAvailability" influxdb: "influxdb" rabbitmq: "rabbitmq_rabbitmq-server" td-agent: "treasuredata" -- cgit v1.2.3