summaryrefslogtreecommitdiffstats
path: root/fuel/prototypes
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2015-04-16 20:25:50 +0200
committerStefan K. Berg <stefan.k.berg@ericsson.com>2015-04-16 20:25:50 +0200
commit4b5977c92d16d1f4af9293fc874645e671674c22 (patch)
tree2f02ca27dddceedfdde2a241345cdf87c88194a2 /fuel/prototypes
parentd2b1e4628ae701c5c220ff7dc98560af7d9855ae (diff)
Correction of verification phase in deploy
The finishing verification failed to correctly identify good deploys as such. JIRA Change-Id: I193d5cad977c3d004c8825036fa6fa375268de0b Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'fuel/prototypes')
-rwxr-xr-xfuel/prototypes/libvirt/deploy/deploy.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/fuel/prototypes/libvirt/deploy/deploy.sh b/fuel/prototypes/libvirt/deploy/deploy.sh
index 7eff3da..5d267e6 100755
--- a/fuel/prototypes/libvirt/deploy/deploy.sh
+++ b/fuel/prototypes/libvirt/deploy/deploy.sh
@@ -82,17 +82,19 @@ isofile=$deployiso
. ${functions}/install_iso.sh
. ${functions}/deploy_env.sh
-echo "Waiting for two minutes for deploy to stabilize"
-sleep 2m
+echo "Waiting for five minutes for deploy to stabilize"
+sleep 5m
echo "Verifying node status after deployment"
-set -o pipefail
# Any node with non-ready status?
-ssh root@10.20.0.2 fuel node | tail -n +3 | cut -d "|" -f 2 | \
+ssh root@10.20.0.2 fuel node 2>/dev/null | tail -n +3 | cut -d "|" -f 2 | \
sed 's/ //g' | grep -v ready | wc -l | grep -q "^0$"
if [ $? -ne 0 ]; then
- error_exit "Deployment failed verification"
+ echo "Deploy failed to verify"
+ ssh root@10.20.0.2 fuel node 2>/dev/null
+ error_exit "Exiting with error status"
else
+ ssh root@10.20.0.2 fuel node 2>/dev/null
echo "Deployment verified"
fi