Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/115606
Change subject: Updated dc-migrate a bit.
......................................................................
Updated dc-migrate a bit.
I added a few naps to avoid race conditions, and
added a salt line to enable clearing of the puppet master certs
post-migration.
Change-Id: I06179bb5b0714253c25a07b2a7f73ccb0aede196
---
M files/openstack/folsom/virtscripts/dc-migrate
M files/openstack/havana/virtscripts/dc-migrate
2 files changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/115606/1
diff --git a/files/openstack/folsom/virtscripts/dc-migrate
b/files/openstack/folsom/virtscripts/dc-migrate
index 53d9fda..a247bfe 100755
--- a/files/openstack/folsom/virtscripts/dc-migrate
+++ b/files/openstack/folsom/virtscripts/dc-migrate
@@ -1,7 +1,7 @@
#!/bin/bash
#####################################################################
### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/openstack/folsom/virtscripts/dc-migrate
+### puppet:///files/openstack/havana/virtscripts/dc-migrate
#####################################################################
#set -x
ssh-add -l > /dev/null
@@ -42,6 +42,7 @@
done
TOINSTANCENAME=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova
--os-region ${TOREGION} show ${INSTANCENAME} | grep
'OS-EXT-SRV-ATTR:instance_name' | awk '{ print $4 }'`
TOINSTANCE=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region
${TOREGION} show ${INSTANCENAME} | grep ' id ' | awk '{ print $4 }'`
+sleep 2
echo ""
echo "Migrating $FROMINSTANCE from $FROMHOST to $TOINSTANCE on $TOHOST"
echo ""
@@ -51,8 +52,16 @@
echo "Clearing resolv.conf in instance on $FROMHOST"
echo ""
salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run "rm -f /etc/resolv.conf"
+salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run "rm -f
/etc/resolvconf/resolv.conf.d/original"
+echo ""
+echo "Enabling puppet master cert refresh"
+salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run "touch
/root/allowcertdeletion"
+echo ""
+sleep 1
echo "Destroying instance on $FROMHOST"
echo ""
+OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region ${TOREGION}
stop ${INSTANCENAME}
+sleep 5
ssh $FROMHOST.$FROMREGION.wmnet "virsh destroy ${FROMINSTANCE}"
echo ""
sleep 30
diff --git a/files/openstack/havana/virtscripts/dc-migrate
b/files/openstack/havana/virtscripts/dc-migrate
index 540d360..a247bfe 100755
--- a/files/openstack/havana/virtscripts/dc-migrate
+++ b/files/openstack/havana/virtscripts/dc-migrate
@@ -42,6 +42,7 @@
done
TOINSTANCENAME=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova
--os-region ${TOREGION} show ${INSTANCENAME} | grep
'OS-EXT-SRV-ATTR:instance_name' | awk '{ print $4 }'`
TOINSTANCE=`OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region
${TOREGION} show ${INSTANCENAME} | grep ' id ' | awk '{ print $4 }'`
+sleep 2
echo ""
echo "Migrating $FROMINSTANCE from $FROMHOST to $TOINSTANCE on $TOHOST"
echo ""
@@ -51,8 +52,16 @@
echo "Clearing resolv.conf in instance on $FROMHOST"
echo ""
salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run "rm -f /etc/resolv.conf"
+salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run "rm -f
/etc/resolvconf/resolv.conf.d/original"
+echo ""
+echo "Enabling puppet master cert refresh"
+salt ${FROMINSTANCE}.${FROMREGION}.wmflabs cmd.run "touch
/root/allowcertdeletion"
+echo ""
+sleep 1
echo "Destroying instance on $FROMHOST"
echo ""
+OS_TENANT_NAME=${PROJECT} OS_AUTH_URL=${TOAUTH} nova --os-region ${TOREGION}
stop ${INSTANCENAME}
+sleep 5
ssh $FROMHOST.$FROMREGION.wmnet "virsh destroy ${FROMINSTANCE}"
echo ""
sleep 30
--
To view, visit https://gerrit.wikimedia.org/r/115606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06179bb5b0714253c25a07b2a7f73ccb0aede196
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
