diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-07 03:48:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-07 03:48:30 +0000 |
| commit | 40130b2e7a591931ddac366dc6f8d085e1f83e37 (patch) | |
| tree | 7c1c09718996a48da5251009407e7b7fb108efee /docker/cinder/cinder-api | |
| parent | 61067c4da492c8791477ea667ec3bd0482661ce4 (diff) | |
| parent | 4d7814702c6d25167625d5ccbe8b494aae16010a (diff) | |
| download | kolla-40130b2e7a591931ddac366dc6f8d085e1f83e37.tar.gz kolla-40130b2e7a591931ddac366dc6f8d085e1f83e37.zip | |
Merge "Delete the extra blank lines"
Diffstat (limited to 'docker/cinder/cinder-api')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 13 |
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 %} |