diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-18 21:01:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-18 21:01:55 +0000 |
| commit | cea1c1ebd95e88e0bb2911fea486fe09f600af22 (patch) | |
| tree | a53f9c4f6c1fce4364758a5de52ccebc68c36120 /docker/ceph | |
| parent | 8344c8ea21428c5978d3c5e7ae74d6e43dd8ba95 (diff) | |
| parent | ae1322ec10861678abe1137f3013030b34335bc7 (diff) | |
| download | kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.tar.gz kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.zip | |
Merge "Use base_package_type"
Diffstat (limited to 'docker/ceph')
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/ceph/ceph-nfs/Dockerfile.j2 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 084693a1d..4aeaca4e4 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='ceph') }} -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +{% if base_package_type == 'rpm' %} {% set ceph_base_packages = [ 'btrfs-progs', @@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% endif %} -{% elif base_distro in ['debian', 'ubuntu'] %} +{% elif base_package_type == 'deb' %} {% set ceph_base_packages = [ 'btrfs-progs', diff --git a/docker/ceph/ceph-nfs/Dockerfile.j2 b/docker/ceph/ceph-nfs/Dockerfile.j2 index 1ed1c5fe8..9ace5de52 100644 --- a/docker/ceph/ceph-nfs/Dockerfile.j2 +++ b/docker/ceph/ceph-nfs/Dockerfile.j2 @@ -5,13 +5,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +{% if base_package_type == 'rpm' %} {% set ceph_nfs_packages = [ 'nfs-ganesha', 'nfs-ganesha-ceph' ] %} -{% elif base_distro in ['debian', 'ubuntu'] %} +{% elif base_package_type == 'deb' %} {% set ceph_nfs_packages = [ 'nfs-ganesha', 'nfs-ganesha-ceph' |