diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-13 18:34:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-13 18:34:17 +0000 |
| commit | c571dba035599eaee887436882da6ff0992e0a3b (patch) | |
| tree | 4c7a5b8bb43837b431c413d7a66e39c1abb622c2 /docker | |
| parent | d74edbe9053deb58c8db140074112219e7bceced (diff) | |
| parent | 10c26d90e9ebe4a47d9558dfd64cc6907a46dbf2 (diff) | |
| download | kolla-c571dba035599eaee887436882da6ff0992e0a3b.tar.gz kolla-c571dba035599eaee887436882da6ff0992e0a3b.zip | |
Merge "Add Apache packages to nova-api container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 13a3dd92c..7c8436fd0 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -9,14 +9,37 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set nova_api_packages = [ - 'openstack-nova-api' + 'openstack-nova-api', + 'httpd', + 'mod_wsgi' ] %} {% elif base_distro in ['ubuntu'] %} {% set nova_api_packages = [ 'nova-api', - 'python-memcache' + 'python-memcache', + 'apache2', + 'libapache2-mod-wsgi' + ] %} + + {% endif %} +{{ macros.install_packages(nova_api_packages | customizable("packages")) }} + +{% elif install_type == 'source' %} + + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + + {% set nova_api_packages = [ + 'httpd', + 'mod_wsgi' + ] %} + + {% elif base_distro in ['ubuntu'] %} + + {% set nova_api_packages = [ + 'apache2', + 'libapache2-mod-wsgi' ] %} {% endif %} |