This change squashes two changes that are being backported from the
tripleo-ansible repo. They are to the same file, which was relocated to
tripleo-ansible between Train and Ussuri.
Change https://review.opendev.org/703123: In the kill-script there is a
string "Unknown action ${SIG} for ${$CT_NAME} ${CT_ID}" which results in
a "bad substitution" error, as there is no variable named with what the
contents of the CT_NAME environment variable contains. Remove the
extraneous '$'.
Change https://review.opendev.org/703128: The reason bug #1860155 was
triggered was because the kill script did not have a stanza for handling
the signal that was passed in, which is signal 15. Since signal 15 is
unhandled, keepalived processes will still stick around. Add handling
for signal 15.
Reviewed: https:/ /review. opendev. org/704463 /git.openstack. org/cgit/ openstack/ tripleo- heat-templates/ commit/ ?id=e204f16e5f3 ca238a9c8157fab 7ba673efb71db9
Committed: https:/
Submitter: Zuul
Branch: stable/train
commit e204f16e5f3ca23 8a9c8157fab7ba6 73efb71db9
Author: Nate Johnston <email address hidden>
Date: Mon Jan 27 18:04:52 2020 -0500
Fix kill-script
This change squashes two changes that are being backported from the
tripleo-ansible repo. They are to the same file, which was relocated to
tripleo-ansible between Train and Ussuri.
Change https:/ /review. opendev. org/703123: In the kill-script there is a
string "Unknown action ${SIG} for ${$CT_NAME} ${CT_ID}" which results in
a "bad substitution" error, as there is no variable named with what the
contents of the CT_NAME environment variable contains. Remove the
extraneous '$'.
Change https:/ /review. opendev. org/703128: The reason bug #1860155 was
triggered was because the kill script did not have a stanza for handling
the signal that was passed in, which is signal 15. Since signal 15 is
unhandled, keepalived processes will still stick around. Add handling
for signal 15.
Change-Id: Ib47fc73b498b63 66efa4ae5b16855 bd45cb3ec91
Fixes-Bug: #1860155