diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-23 14:31:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-23 14:31:10 +0000 |
| commit | 2d87de55aa51549de5746539a257f0f035affd0d (patch) | |
| tree | b929297745eafefc7985a4b1ee4f2feaf254577a | |
| parent | e25e8206e28ac135ec717fbdf216b45a0041e38f (diff) | |
| parent | ad7a0f0dcf594fce8c92915b0040ec18eb024d50 (diff) | |
| download | kolla-2d87de55aa51549de5746539a257f0f035affd0d.tar.gz kolla-2d87de55aa51549de5746539a257f0f035affd0d.zip | |
Merge "CentOS 8: Enable hacluster and masakari images" into stable/train
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rwxr-xr-x | 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': { |