diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-13 18:23:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-13 18:23:53 +0000 |
| commit | d74edbe9053deb58c8db140074112219e7bceced (patch) | |
| tree | 93768975c5721b4a637f5230cb4f221fc1905826 /docker | |
| parent | eb1a75fb7f9437172d224554b1a71366e0f3543f (diff) | |
| parent | 1747791a81de6f3060c8f66e44d049b0d618fba2 (diff) | |
| download | kolla-d74edbe9053deb58c8db140074112219e7bceced.tar.gz kolla-d74edbe9053deb58c8db140074112219e7bceced.zip | |
Merge "Add Apache packages to cinder-api container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index fe343fea3..cbedd9fd4 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -9,14 +9,39 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set cinder_api_packages = [ - 'python-keystone' + 'python-keystone', + 'httpd', + 'mod_wsgi' ] %} {% elif base_distro in ['ubuntu'] %} {% set cinder_api_packages = [ - 'cinder-api' + '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 %} |