From 1db5b7421eb87d6d5c5d2490212ac1cab0bb28de Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 20 Apr 2018 16:06:16 -0600 Subject: [PATCH] Add in a STOPSIGNAL configuration For docker 1.13.1, if STOPSIGNAL is not provided in the docker image, the container will not automatically restart the container. It might be better to define this in the Kolla scripts as a configuration option for each container, but I'm unsure if it's a problem for any other version so it might be best to configure this in tripleo until a newer version of docker is consumed. Additionally I'm not sure if any of the containers would need something other than STOPSIGNAL SIGTERM which should be the default if none is provided. Change-Id: I1939f9e6b2c432a672c7426ddabdcfca6ce150b7 Related-Bug: #1765802 (cherry picked from commit 039dbccb5d568953e281a21854916b60ad0a98e4) --- container-images/tripleo_kolla_template_overrides.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index 658d3e324..81c5c4da3 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -447,4 +447,6 @@ RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir {% block base_footer %} # workaround LP1696283 RUN mkdir -p /etc/ssh && touch /etc/ssh/ssh_known_hosts +# workaround for LP#1765802 +STOPSIGNAL SIGTERM {% endblock %}