From 4d7814702c6d25167625d5ccbe8b494aae16010a Mon Sep 17 00:00:00 2001 From: zhubingbing <1392607554@qq.com> Date: Sun, 5 Feb 2017 21:14:19 +0800 Subject: Delete the extra blank lines Change-Id: I41fdfd819c7b162f949a50f928350f246eba7df4 --- docker/cinder/cinder-base/Dockerfile.j2 | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'docker/cinder/cinder-base') 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 -- cgit v1.2.3