Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/280647
Change subject: wmf-reimage: fix salt signing
......................................................................
wmf-reimage: fix salt signing
Bug: T124761
Change-Id: Ie342fa606ee7bae010dfd26bea9de42bb86654f7
---
M modules/puppetmaster/files/wmf-reimage
1 file changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/280647/1
diff --git a/modules/puppetmaster/files/wmf-reimage
b/modules/puppetmaster/files/wmf-reimage
index e7a3bef..25ba300 100755
--- a/modules/puppetmaster/files/wmf-reimage
+++ b/modules/puppetmaster/files/wmf-reimage
@@ -91,13 +91,19 @@
log "Seeking the SALT node key to add"
log "This is the time to start a puppet run on the host."
while true; do
- if ! __salt_key status ${nodename} "accepted"; then
+ if __salt_key status ${nodename} "missing"; then
echo -n "."
sleep $SLEEPTIME
continue
- fi
-
- if __salt_key accept ${nodename} "done"; then
+ elif __salt_key status ${nodename} "pending"; then
+ if __salt_key accept ${nodename} "done"; then
+ echo "+"
+ break
+ else
+ echo -n '|'
+ sleep $SLEEPTIME
+ fi
+ elif __salt_key status ${nodename} "accepted"; then
echo "+"
break
fi
--
To view, visit https://gerrit.wikimedia.org/r/280647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie342fa606ee7bae010dfd26bea9de42bb86654f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
