openstack
/
instack-undercloud
Code Issues Proposed changes

Temporarily set +e on systemd-journald restart for +bug/1564471 

Though the restart of the systemd-journald service succeeds fine, an
assertion error during the restart of the systemd-journald service
causes the instack-undercloud install to fail (this is during an
undercloud upgrade in fact, details in the bug).

This review sets +e to allow the script to continue and then also
checks that the service was indeed started OK, exiting otherwise.

Related-Bug: 1564471
Change-Id: I38c14a6b143b51dec6f6f88f2e1cb591e07a08b3
(cherry picked from commit cc41b7a1f9)
This commit is contained in:
marios 2016-03-31 18:55:56 +03:00 committed by Jiri Stransky
parent 7bf281c534
commit 9f6e87809a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
elements/undercloud-install/pre-install.d/01-persistent-journal
View File

@ -6,5 +6,14 @@ set -o pipefail
# Enable persistent logging for the systemd journal
mkdir -p /var/log/journal
# Restart the journald service
# TODO(marios): temporarily +e for +bug/1564471 then check service restarted
set +e
systemctl restart systemd-journald.service
set -e
sleep 2
is_active=$(systemctl is-active systemd-journald)
if [[ $is_active != "active" ]]; then
set +x
echo "*** Error *** Couldn't restart systemd-journald"
exit 1
fi