From 000a1fd9fd72a4e09a58e9f2f162d1fe595be30f Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 30 Jan 2019 16:13:47 -0700 Subject: [PATCH] Revert "Remove placement healthcheck from overrides" This reverts commit 32d357eca117b36ec3e1475e04d4e9d6c30f42fa. This change reverts the nova-placement-api health check and comments out the placement-api health check Change-Id: I74d86649d74b2a843d42db5903c1d0a1ffc95e4b Related-Bug: #1813998 --- .../tripleo_kolla_template_overrides.j2 | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index c85529b8a..14c70456c 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -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