Ryan Lane has submitted this change and it was merged.
Change subject: Fix variable inclusion in puppet reactor
......................................................................
Fix variable inclusion in puppet reactor
Change-Id: Id4464af784adc30b97607353afefbbf372cc89e6
---
M modules/salt_reactors/templates/puppet.sls.erb
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/salt_reactors/templates/puppet.sls.erb
b/modules/salt_reactors/templates/puppet.sls.erb
index 89a85e8..96b677d 100644
--- a/modules/salt_reactors/templates/puppet.sls.erb
+++ b/modules/salt_reactors/templates/puppet.sls.erb
@@ -19,9 +19,8 @@
subprocess.call(['/usr/sbin/puppetca', '-s', data['id']])
f.write(json.dumps({'key_accepted': '1'}))
f.close()
- return {'run_puppet': {'cmd.cmd.run': [{'tgt': data['id']}, {'arg':
['puppet agent --server=<%= puppet_master %> --test; salt-call
event.fire_master "run_finished" "puppet"']}]}}
+ return {'run_puppet': {'cmd.cmd.run': [{'tgt': data['id']}, {'arg':
['puppet agent --server=<%= salt_reactor_options["puppet_server"] %> --test;
salt-call event.fire_master "run_finished" "puppet"']}]}}
if data['data'] == 'run_finished':
if os.path.exists(first_run):
os.unlink(first_run)
- else:
- return {}
+ return {}
--
To view, visit https://gerrit.wikimedia.org/r/50761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4464af784adc30b97607353afefbbf372cc89e6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
