diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-02 16:58:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-02 16:58:08 +0000 |
| commit | 86e8f03967ce8269097fa061f97e14911fbbc6b0 (patch) | |
| tree | 70094178cd0d7a12775b4bc38bbecb7fc14d5135 | |
| parent | e86a0514aac064857f7dc2fa266b2b633991e359 (diff) | |
| parent | 4a5f53eea1d50e6034a8f0a9c386707386e49797 (diff) | |
| download | kolla-86e8f03967ce8269097fa061f97e14911fbbc6b0.tar.gz kolla-86e8f03967ce8269097fa061f97e14911fbbc6b0.zip | |
Merge "Add nova-placement-api container"
| -rw-r--r-- | docker/nova/nova-placement-api/Dockerfile.j2 | 59 | ||||
| -rw-r--r-- | docker/nova/nova-placement-api/extend_start.sh | 11 |
2 files changed, 70 insertions, 0 deletions
diff --git a/docker/nova/nova-placement-api/Dockerfile.j2 b/docker/nova/nova-placement-api/Dockerfile.j2 new file mode 100644 index 000000000..dfd7a1f2f --- /dev/null +++ b/docker/nova/nova-placement-api/Dockerfile.j2 @@ -0,0 +1,59 @@ +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block nova_placement_api_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + + {% set nova_placement_api_packages = [ + 'httpd', + 'mod_wsgi', + 'openstack-nova-placement-api' + ] %} + +{{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }} +RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf + + {% elif base_distro in ['ubuntu'] %} + + {% set nova_placement_api_packages = [ + 'apache2', + 'libapache2-mod-wsgi', + 'nova-placement-api' + ] %} + +{{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }} +RUN truncate -s 0 /etc/apache2/ports.conf + + {% endif %} +{% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + + {% set nova_placement_api_packages = [ + 'httpd', + 'mod_wsgi' + ] %} + +{{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }} +RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf + {% elif base_distro in ['ubuntu'] %} + + {% set nova_placement_api_packages = [ + 'apache2', + 'libapache2-mod-wsgi' + ] %} + +{{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }} +RUN truncate -s 0 /etc/apache2/ports.conf + + {% endif %} +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start +RUN chmod 755 /usr/local/bin/kolla_nova_extend_start + +{% block nova_placement_api_footer %}{% endblock %} +{% block footer %}{% endblock %} diff --git a/docker/nova/nova-placement-api/extend_start.sh b/docker/nova/nova-placement-api/extend_start.sh new file mode 100644 index 000000000..904db04b2 --- /dev/null +++ b/docker/nova/nova-placement-api/extend_start.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +# NOTE(pbourke): httpd will not clean up after itself in some cases which +# results in the container not being able to restart. (bug #1489676, 1557036) +if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then + # Loading Apache2 ENV variables + source /etc/apache2/envvars + rm -rf /var/run/apache2/* +else + rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* +fi |