aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder/cinder-base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/cinder/cinder-base')
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index ab3109b6b..d8becd4f6 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='cinder') }}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% if base_package_type == 'rpm' %}
{% set cinder_base_packages = [
'ceph-common',
'lvm2',
@@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-automaton',
'python-oslo-vmware'
] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set cinder_base_packages = [
'ceph-common',
'cinder-common',
@@ -29,7 +29,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% if base_package_type == 'rpm' %}
{% set cinder_base_packages = [
'ceph-common',
'lvm2',
@@ -44,7 +44,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'qemu-img'
] %}
{% endif %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set cinder_base_packages = [
'ceph-common',
'lvm2',