aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder/cinder-base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-07 03:48:30 +0000
committerGerrit Code Review <review@openstack.org>2017-02-07 03:48:30 +0000
commit40130b2e7a591931ddac366dc6f8d085e1f83e37 (patch)
tree7c1c09718996a48da5251009407e7b7fb108efee /docker/cinder/cinder-base
parent61067c4da492c8791477ea667ec3bd0482661ce4 (diff)
parent4d7814702c6d25167625d5ccbe8b494aae16010a (diff)
downloadkolla-40130b2e7a591931ddac366dc6f8d085e1f83e37.tar.gz
kolla-40130b2e7a591931ddac366dc6f8d085e1f83e37.zip
Merge "Delete the extra blank lines"
Diffstat (limited to 'docker/cinder/cinder-base')
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j210
1 files changed, 0 insertions, 10 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index b50d0f978..5f08bb052 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -9,45 +9,35 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-
{% set cinder_base_packages = [
'openstack-cinder',
'python-automaton',
'lvm2',
'ceph-common'
] %}
-
{% elif base_distro in ['ubuntu'] %}
-
{% set cinder_base_packages = [
'cinder-common',
'ceph-common',
'lvm2'
] %}
-
{% endif %}
-
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-
{% set cinder_base_packages = [
'lvm2',
'qemu-img',
'ceph-common'
] %}
-
{% elif base_distro in ['ubuntu', 'debian'] %}
-
{% set cinder_base_packages = [
'lvm2',
'qemu-utils',
'ceph-common'
] %}
-
{% endif %}
-
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
ADD cinder-base-archive /cinder-base-source