diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-31 19:26:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-31 19:26:02 +0000 |
| commit | d00fa3a6dda3914e66ed414ef758bf2aeda2906c (patch) | |
| tree | 5facd4fc0e5dd104daec8656d2be08eee701157f /kolla | |
| parent | c1d1a65a5ba9d25abd02c52bb00d8b6b5c4797a0 (diff) | |
| parent | 70423f19596f92ed01c89e7d62f8c46a6dba6a23 (diff) | |
| download | kolla-d00fa3a6dda3914e66ed414ef758bf2aeda2906c.tar.gz kolla-d00fa3a6dda3914e66ed414ef758bf2aeda2906c.zip | |
Merge "CentOS 8: Use upstream Ceph/master"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/image/build.py | 7 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index da1f7aa22..c01615c50 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -147,19 +147,13 @@ UNBUILDABLE_IMAGES = { # CentOS 8. 'centos8': { "ceph-base", # Missing Ceph repo - "cinder-base", # Missing Ceph repo "collectd", # Missing collectd-ping and # collectd-sensubility packages "elasticsearch", # Missing elasticsearch repo - "glance-base", # Missing Ceph repo - "gnocchi-base", # Missing Ceph repo "hacluster-base", # Missing hacluster repo "kibana", # Missing elasticsearch repo - "manila-share", # Missing Ceph repo "mongodb", # Missing mongodb and mongodb-server packages "monasca-grafana", # Using python2 - "nova-compute", # Missing Ceph repo - "nova-libvirt", # Missing Ceph repo "nova-spicehtml5proxy", # Missing spicehtml5 package "opendaylight", # Missing opendaylight repo "ovsdpdk", # Not supported on CentOS @@ -172,7 +166,6 @@ UNBUILDABLE_IMAGES = { "cyborg-agent", # opae-sdk does not support CentOS 8 "freezer-base", # Missing package trickle "masakari-monitors", # Missing hacluster repo - "zun-compute", # Missing Ceph repo }, 'debian': { diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 3d5ce7c69..90f245368 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -37,7 +37,12 @@ centos-ppc64le: opstools: "centos-release-opstools" rabbitmq: "rabbitmq_rabbitmq-server" +# TODO(mnasiadka): Rework the repo list once Ceph Octopus is released centos8: + ceph: "ceph" + ceph-noarch: "ceph-noarch" + ceph-el8: "ceph-el8" + ceph-lab-extras: "ceph-lab-extras" grafana: "grafana" influxdb: "influxdb" rabbitmq: "rabbitmq_rabbitmq-server" |