[MediaWiki-commits] [Gerrit] for wmf reimage script, don't rotate saltmaster aes key on m... - change (operations/puppet)

2015-09-28 Thread ArielGlenn (Code Review) 
ArielGlenn has submitted this change and it was merged.

Change subject: for wmf reimage script, don't rotate saltmaster aes key on 
minion key deletion
..


for wmf reimage script, don't rotate saltmaster aes key on minion key deletion

Change-Id: Iab20e6b8856dcde076c5080d44f00ba83798c216
---
M modules/puppetmaster/files/wmf-reimage
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/puppetmaster/files/wmf-reimage 
b/modules/puppetmaster/files/wmf-reimage
index a26b4b3..8a98686 100755
--- a/modules/puppetmaster/files/wmf-reimage
+++ b/modules/puppetmaster/files/wmf-reimage
@@ -35,9 +35,9 @@
 # ask confirmation later about unaccepted keys
 if salt-key --list accepted | fgrep -q ${nodename}; then
 if [ ${force_yes} -eq 1 ]; then
-salt-key -y --delete ${nodename}
+salt-key -y --rotate-aes-key= --delete ${nodename}
 else
-salt-key --delete ${nodename}
+salt-key --rotate-aes-key= --delete ${nodename}
 fi
 fi
 # salt-key --delete above exits 0 regardless, double check

-- 
To view, visit https://gerrit.wikimedia.org/r/238164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab20e6b8856dcde076c5080d44f00ba83798c216
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] for wmf reimage script, don't rotate saltmaster aes key on m... - change (operations/puppet)

2015-09-14 Thread ArielGlenn (Code Review) 
ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/238164

Change subject: for wmf reimage script, don't rotate saltmaster aes key on 
minion key deletion
..

for wmf reimage script, don't rotate saltmaster aes key on minion key deletion

Change-Id: Iab20e6b8856dcde076c5080d44f00ba83798c216
---
M modules/puppetmaster/files/wmf-reimage
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/238164/1

diff --git a/modules/puppetmaster/files/wmf-reimage 
b/modules/puppetmaster/files/wmf-reimage
index a26b4b3..8a98686 100755
--- a/modules/puppetmaster/files/wmf-reimage
+++ b/modules/puppetmaster/files/wmf-reimage
@@ -35,9 +35,9 @@
 # ask confirmation later about unaccepted keys
 if salt-key --list accepted | fgrep -q ${nodename}; then
 if [ ${force_yes} -eq 1 ]; then
-salt-key -y --delete ${nodename}
+salt-key -y --rotate-aes-key= --delete ${nodename}
 else
-salt-key --delete ${nodename}
+salt-key --rotate-aes-key= --delete ${nodename}
 fi
 fi
 # salt-key --delete above exits 0 regardless, double check

-- 
To view, visit https://gerrit.wikimedia.org/r/238164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab20e6b8856dcde076c5080d44f00ba83798c216
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits