Andrew Bogott has submitted this change and it was merged.
Change subject: Added even more error checking to dc-migrate.
......................................................................
Added even more error checking to dc-migrate.
Change-Id: Ie383903f56eb578e0e4ff2a296ca807bdb4a2d17
---
M files/openstack/havana/virtscripts/dc-migrate
1 file changed, 20 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/openstack/havana/virtscripts/dc-migrate
b/files/openstack/havana/virtscripts/dc-migrate
index eab4be3..df24548 100755
--- a/files/openstack/havana/virtscripts/dc-migrate
+++ b/files/openstack/havana/virtscripts/dc-migrate
@@ -39,12 +39,21 @@
echo "ERROR: ${INSTANCENAME} must be ACTIVE before we can migrate it."
exit 1
fi
+echo ""
FROMIMAGE=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${FROMAUTH} nova --os-region
${FROMREGION} show ${INSTANCENAME} | grep ' image ' | awk '{gsub ( "[()]","" )
; print $(NF-1) }'`
FROMFLAVOR=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${FROMAUTH} nova --os-region
${FROMREGION} show ${INSTANCENAME} | grep ' flavor ' | awk '{gsub ( "[()]","" )
; print $5 }'`
FROMSECURITYRAW=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${FROMAUTH} nova
--os-region ${FROMREGION} show ${INSTANCENAME} | grep ' security_groups ' | awk
-F "|" '{ print $3 }'`
FROMSECURITY=`python -c "print ','.join([o['name'] for o in
${FROMSECURITYRAW}])"`
FROMHOST=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${FROMAUTH} nova --os-region
${FROMREGION} show ${INSTANCENAME} | grep 'OS-EXT-SRV-ATTR:host' | awk '{ print
$4 }'`
FROMINSTANCE=$FROMINSTANCENAME
+echo "Testing salt on ${FROMINSTANCE}.${FROMREGION}"
+echo ""
+salt ${FROMINSTANCE}.${FROMREGION}.wmflabs test.ping
+if [ "$?" != "0" ]
+then
+ echo "${INSTAMCENAME} is not responding to salt."
+ exit 1
+fi
echo "Creating initial image in $TOREGION"
CREATED=`cd /srv/org/wikimedia/controller/wikis/w && php
./extensions/OpenStackManager/maintenance/createInstance.php --image
${FROMIMAGE} --flavor ${FROMFLAVOR} --instance ${INSTANCENAME} --project
${PROJECT} --region ${TOREGION} --securitygroups ${FROMSECURITY} --copypuppet
${FROMINSTANCE} --copypuppetregion ${FROMREGION}`
if [ "$CREATED" != "created instance." ]; then
@@ -82,6 +91,17 @@
ssh $FROMHOST.$FROMREGION.wmnet "virsh destroy ${FROMINSTANCE}"
echo ""
sleep 5
+echo "Verifying that both instances are now stopped."
+FROMINSTANCESTATUS=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${FROMAUTH} nova
--os-region ${FROMREGION} show ${INSTANCENAME} | grep ' status ' | awk '{ print
$4 }'`
+if [ "$FROMINSTANCESTATUS" != 'SHUTOFF' ]; then
+ echo "ERROR: the ${FROMREGION} ${INSTANCENAME} failed to shut down. We
can't copy files."
+ exit 1
+fi
+TOINSTANCESTATUS=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova
--os-region ${TOREGION} show ${INSTANCENAME} | grep ' status ' | awk '{ print
$4 }'`
+if [ "$TOINSTANCESTATUS" != 'SHUTOFF' ]; then
+ echo "ERROR: the ${TOREGION} ${INSTANCENAME} failed to shut down. We
can't copy files."
+ exit 1
+fi
echo ""
echo "Rsyncing instance from $FROMHOST to $TOHOST"
echo ""
--
To view, visit https://gerrit.wikimedia.org/r/116071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie383903f56eb578e0e4ff2a296ca807bdb4a2d17
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
