diff options
| author | Zuul <zuul@review.opendev.org> | 2019-05-07 05:08:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-05-07 05:08:01 +0000 |
| commit | e5bc650836d7f4a746d7d6c8c64089ed511ce556 (patch) | |
| tree | 283acee3064d71aee5c5fa608f03f60731638e37 | |
| parent | 9e9e31ed2c671d7547354708bb8decc05c737ecd (diff) | |
| parent | 755e65c3f9e38bbfdb22238fde33b92fb971ff2c (diff) | |
| download | kolla-e5bc650836d7f4a746d7d6c8c64089ed511ce556.tar.gz kolla-e5bc650836d7f4a746d7d6c8c64089ed511ce556.zip | |
Merge "Remove nova-placement-api"
| -rw-r--r-- | docker/nova/nova-placement-api/Dockerfile.j2 | 71 | ||||
| -rw-r--r-- | docker/nova/nova-placement-api/extend_start.sh | 11 |
2 files changed, 0 insertions, 82 deletions
diff --git a/docker/nova/nova-placement-api/Dockerfile.j2 b/docker/nova/nova-placement-api/Dockerfile.j2 deleted file mode 100644 index 0f66d2eb5..000000000 --- a/docker/nova/nova-placement-api/Dockerfile.j2 +++ /dev/null @@ -1,71 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block nova_placement_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - - {% set nova_placement_api_packages = [ - 'httpd', - 'mod_ssl', - 'openstack-nova-placement-api' - ] %} - {% if distro_python_version.startswith('3') %} - {% set nova_placement_api_packages = nova_placement_api_packages + ['python3-mod_wsgi'] %} - {% else %} - {% set nova_placement_api_packages = nova_placement_api_packages + ['mod_wsgi'] %} - {% endif %} - -{{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }} -RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ - && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf - - {% elif base_package_type == 'deb' %} - - {% set nova_placement_api_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3', - '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_package_type == 'rpm' %} - - {% set nova_placement_api_packages = [ - 'httpd', - 'mod_ssl', - ] %} - {% if distro_python_version.startswith('3') %} - {% set nova_placement_api_packages = nova_placement_api_packages + ['python3-mod_wsgi'] %} - {% else %} - {% set nova_placement_api_packages = nova_placement_api_packages + ['mod_wsgi'] %} - {% endif %} - -{{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }} -RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ - && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf - {% elif base_package_type == 'deb' %} - - {% 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 deleted file mode 100644 index 4596bf6a1..000000000 --- a/docker/nova/nova-placement-api/extend_start.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/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 - . /etc/apache2/envvars - rm -rf /var/run/apache2/* -else - rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* -fi |