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-api/Dockerfile.j2 | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'docker/cinder/cinder-api') diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index cbedd9fd4..85f18eb3c 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -7,45 +7,32 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set cinder_api_packages = [ 'python-keystone', 'httpd', 'mod_wsgi' ] %} - - {% elif base_distro in ['ubuntu'] %} - {% set cinder_api_packages = [ 'cinder-api', 'apache2', 'libapache2-mod-wsgi' ] %} - {% endif %} - {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set cinder_api_packages = [ 'httpd', 'mod_wsgi' ] %} - - {% elif base_distro in ['ubuntu'] %} - {% set cinder_api_packages = [ 'apache2', 'libapache2-mod-wsgi' ] %} - {% endif %} - {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} {% endif %} -- cgit v1.2.3