openstack
/
tripleo-common
Code Issues Proposed changes

Revert "Remove placement healthcheck from overrides" 

This reverts commit 32d357eca1.

This change reverts the nova-placement-api health check and comments out
the placement-api health check

Change-Id: I74d86649d74b2a843d42db5903c1d0a1ffc95e4b
Related-Bug: #1813998
This commit is contained in:
Alex Schultz 2019-01-30 16:13:47 -07:00
parent 32b1b8b936
commit 000a1fd9fd
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
container-images/tripleo_kolla_template_overrides.j2
View File

@ -501,6 +501,12 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block nova_placement_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-placement /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block octavia_api_footer %}
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 \
@ -540,11 +546,12 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block placement_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/placement-api /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
#TODO(aschultz): uncomment once we have promotion see LP#1813998
#{% block placement_api_footer %}
#RUN mkdir -p /openstack && \
# ln -s /usr/share/openstack-tripleo-common/healthcheck/placement-api /openstack/healthcheck && \
# chmod a+rx /openstack/healthcheck
#{% endblock %}
{% block rabbitmq_install_plugins %}
# External rabbitmq plugins installation is disabled