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 /docker/cinder | |
| parent | c1d1a65a5ba9d25abd02c52bb00d8b6b5c4797a0 (diff) | |
| parent | 70423f19596f92ed01c89e7d62f8c46a6dba6a23 (diff) | |
| download | kolla-d00fa3a6dda3914e66ed414ef758bf2aeda2906c.tar.gz kolla-d00fa3a6dda3914e66ed414ef758bf2aeda2906c.zip | |
Merge "CentOS 8: Use upstream Ceph/master"
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 8ed7e0d20..964cfd325 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -7,7 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='cinder') }} -{{ macros.enable_extra_repos(['ceph']) }} +# FIXME(mnasiadka): Remove when CentOS Storage SIG repo is available for CentOS 8 +{% if distro_package_manager == 'dnf' %} + {{ macros.enable_extra_repos(['ceph', 'ceph-noarch', 'ceph-el8', 'ceph-lab-extras']) }} +{% else %} + {{ macros.enable_extra_repos(['ceph']) }} +{% endif %} {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} |