openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Don't try to run os-net-config from yum_update.sh 

The UpdateDeployment already depends on NetworkDeployment.
We should not run os-net-config unconditionally before update.

Closes-Bug: #1666227

Change-Id: I48cbf5de00d47c6fdad71ff24c00e9db05cec5d5
(cherry picked from commit b19d6306ea)
This commit is contained in:
Lukas Bezdicka 2017-03-13 14:39:12 +01:00 committed by Lukas Bezdicka
parent 3bb80a3bbe
commit 5cd57aa2d3
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extraconfig/tasks/yum_update.sh
View File

@ -97,17 +97,6 @@ return_code=$?
echo "$result" echo "$result"
echo "yum return code: $return_code" echo "yum return code: $return_code"
# Writes any changes caused by alterations to os-net-config and bounces the
# interfaces *before* restarting the cluster.
os-net-config -c /etc/os-net-config/config.json -v --detailed-exit-codes
RETVAL=$?
if [[ $RETVAL == 2 ]]; then
echo "os-net-config: interface configuration files updated successfully"
elif [[ $RETVAL != 0 ]]; then
echo "ERROR: os-net-config configuration failed"
exit $RETVAL
fi
if [[ "$pacemaker_status" == "active" ]] ; then if [[ "$pacemaker_status" == "active" ]] ; then
echo "Starting cluster node" echo "Starting cluster node"
pcs cluster start pcs cluster start