Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: puppetmaster-labs: make puppetsigner work with puppet 3
......................................................................
puppetmaster-labs: make puppetsigner work with puppet 3
Change-Id: Iff44e85c93298cd4cb6afc59067057c00ebe2755
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M modules/ldap/files/scripts/puppetsigner.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ldap/files/scripts/puppetsigner.py
b/modules/ldap/files/scripts/puppetsigner.py
old mode 100644
new mode 100755
index 074d7be..8593d5a
--- a/modules/ldap/files/scripts/puppetsigner.py
+++ b/modules/ldap/files/scripts/puppetsigner.py
@@ -29,7 +29,7 @@
ldapSupportLib.setBindInfoByOptions(options, parser)
ds = ldapSupportLib.connect()
try:
- proc = subprocess.Popen('/usr/sbin/puppetca -l', shell=True,
stdout=subprocess.PIPE)
+ proc = subprocess.Popen('/usr/bin/puppet cert list --all', shell=True,
stdout=subprocess.PIPE)
hosts = proc.communicate()
hosts = hosts[0].split()
for host in hosts:
@@ -46,7 +46,7 @@
except Exception:
sys.stderr.write('Failed to remove the certificate: ' +
path + '\n')
else:
- subprocess.Popen(['/usr/sbin/puppetca -s ' + host],
shell=True, stderr=subprocess.PIPE)
+ subprocess.Popen(['/usr/bin/puppet cert sign ' + host],
shell=True, stderr=subprocess.PIPE)
subprocess.Popen(['/usr/bin/php
/srv/org/wikimedia/controller/wikis/w/extensions/OpenStackManager/maintenance/onInstanceActionCompletion.php
--action=build --instance=' + host], shell=True, stderr=subprocess.PIPE)
proc = subprocess.Popen('/usr/bin/salt-key --list=unaccepted
--out=json', shell=True, stdout=subprocess.PIPE)
hosts = proc.communicate()
--
To view, visit https://gerrit.wikimedia.org/r/137922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff44e85c93298cd4cb6afc59067057c00ebe2755
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
