openstack/kolla
Code Issues Proposed changes

CentOS 8: Enable hacluster and masakari images

Browse Source 
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 <mark@stackhpc.com>
Change-Id: I1c786eda399eca4464c9d68ac040c2965350f775
This commit is contained in:
Marcin Juszkiewicz 2020-02-04 19:18:10 +01:00 committed by Mark Goddard
parent 5498671b34
commit 92224ccb51
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/hacluster/hacluster-base/Dockerfile.j2
View File

@ -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

2
docker/hacluster/hacluster-pcs/Dockerfile.j2
View File

@ -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")) }}

2
docker/masakari/masakari-monitors/Dockerfile.j2
View File

@ -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' %}

3
kolla/image/build.py
View File

@ -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': {

1
kolla/template/repos.yaml
View File

@ -44,6 +44,7 @@ centos8:
epel: "epel"
epel-modular: "epel-modular"
grafana: "grafana"
hacluster: "HighAvailability"
influxdb: "influxdb"
rabbitmq: "rabbitmq_rabbitmq-server"
td-agent: "treasuredata"