Remove nova-placement-api
Now that the required changes to extract Placement from Nova have landed in kolla-ansible we can remove the nova-placement-api service from kolla. Change-Id: Ifff5c60f5690098619bf5a43f25ae3895a96e0d2
This commit is contained in:
parent
869adb8e80
commit
755e65c3f9
@ -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 %}
|
|
@ -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
|
|
Loading…
x
Reference in New Issue
Block a user