Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102038
Change subject: Add -y condition to salt-key for puppetsigner script
......................................................................
Add -y condition to salt-key for puppetsigner script
Change-Id: I97df4333f44af09536fffb1522750bbf8e8a30e9
---
M modules/ldap/files/scripts/puppetsigner.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/102038/1
diff --git a/modules/ldap/files/scripts/puppetsigner.py
b/modules/ldap/files/scripts/puppetsigner.py
index 323df24..074d7be 100644
--- a/modules/ldap/files/scripts/puppetsigner.py
+++ b/modules/ldap/files/scripts/puppetsigner.py
@@ -58,7 +58,7 @@
if not PosixData:
subprocess.Popen(['/usr/bin/salt-key -y -d ' + host],
shell=True, stdout=subprocess.PIPE)
else:
- subprocess.Popen(['/usr/bin/salt-key -a ' + host], shell=True,
stderr=subprocess.PIPE)
+ subprocess.Popen(['/usr/bin/salt-key -y -a ' + host],
shell=True, stderr=subprocess.PIPE)
except ldap.PROTOCOL_ERROR:
sys.stderr.write("There was an LDAP protocol error; see traceback.\n")
traceback.print_exc(file=sys.stderr)
--
To view, visit https://gerrit.wikimedia.org/r/102038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97df4333f44af09536fffb1522750bbf8e8a30e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <rl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
