aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder/cinder-api
diff options
context:
space:
mode:
authorzhubingbing <1392607554@qq.com>2017-02-05 21:14:19 +0800
committerzhubingbing <1392607554@qq.com>2017-02-05 21:14:19 +0800
commit4d7814702c6d25167625d5ccbe8b494aae16010a (patch)
tree830ab3dfdbacbb4230b6a68884405cc35e4dd232 /docker/cinder/cinder-api
parentd3eb84c56d591ef1b63b1f0343c481b8a08470b5 (diff)
downloadkolla-4d7814702c6d25167625d5ccbe8b494aae16010a.tar.gz
kolla-4d7814702c6d25167625d5ccbe8b494aae16010a.zip
Delete the extra blank lines
Change-Id: I41fdfd819c7b162f949a50f928350f246eba7df4
Diffstat (limited to 'docker/cinder/cinder-api')
-rw-r--r--docker/cinder/cinder-api/Dockerfile.j213
1 files changed, 0 insertions, 13 deletions
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 %}