openstack
/
kolla
Code Issues Proposed changes

Merge "CentOS 8: Enable hacluster and masakari images" into stable/train

This commit is contained in:
Zuul 2020-03-23 14:31:10 +00:00 committed by Gerrit Code Review
parent e25e8206e2 ad7a0f0dcf
commit 2d87de55aa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/base/Dockerfile.j2
View File

@ -244,6 +244,7 @@ COPY ceph.repo /etc/yum.repos.d/
'dnf-plugins-core'
] %}
{% set base_centos_yum_repos_to_enable = [
'HighAvailability',
'PowerTools'
] %}
{% else %}

3
kolla/image/build.py
View File

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