wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sync minor fixes from OpenStack Infra

Browse source 
Infra has been keeping a local copy of this waiting for ansible 2 to
release. In getting ready for ansible 2 (and our ability to delete our
local copy of the file, I noticed we had a couple of minor cleanups.

Also, the timeout command is there to improve life and workaround puppet
deficiencies. However, it's not working around deficiencies on systems
that do not have the timeout command if we blindly use it.

The puppet specific timeout options are more complex and out of scope of
this.

Issue: #1273
This commit is contained in:
Monty Taylor 2015-11-25 07:44:32 -05:00 committed by Matt Clay
parent 7ecbd8e34e
commit 40a4247611
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/ansible/modules/extras/system/puppet.py
View file

@ -19,6 +19,11 @@ import os
import pipes import pipes
import stat import stat
try:
import json
except ImportError:
import simplejson as json
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: puppet module: puppet
@ -38,13 +43,15 @@ options:
required: false required: false
default: None default: None
manifest: manifest:
desciption: description:
- Path to the manifest file to run puppet apply on. - Path to the manifest file to run puppet apply on.
required: false required: false
default: None default: None
show_diff: show_diff:
description: description:
- Should puppet return diffs of changes applied. Defaults to off to avoid leaking secret changes by default. - >
Should puppet return diffs of changes applied. Defaults to off to
avoid leaking secret changes by default.
required: false required: false
default: no default: no
choices: [ "yes", "no" ] choices: [ "yes", "no" ]
@ -127,6 +134,9 @@ def main():
module.fail_json( module.fail_json(
msg="Could not find puppet. Please ensure it is installed.") msg="Could not find puppet. Please ensure it is installed.")
global TIMEOUT_CMD
TIMEOUT_CMD = module.get_bin_path("timeout", False)
if p['manifest']: if p['manifest']:
if not os.path.exists(p['manifest']): if not os.path.exists(p['manifest']):
module.fail_json( module.fail_json(
@ -139,7 +149,8 @@ def main():
PUPPET_CMD + " config print agent_disabled_lockfile") PUPPET_CMD + " config print agent_disabled_lockfile")
if os.path.exists(stdout.strip()): if os.path.exists(stdout.strip()):
module.fail_json( module.fail_json(
msg="Puppet agent is administratively disabled.", disabled=True) msg="Puppet agent is administratively disabled.",
disabled=True)
elif rc != 0: elif rc != 0:
module.fail_json( module.fail_json(
msg="Puppet agent state could not be determined.") msg="Puppet agent state could not be determined.")
@ -150,19 +161,24 @@ def main():
module.params['facter_basename'], module.params['facter_basename'],
module.params['facts']) module.params['facts'])
base_cmd = "timeout -s 9 %(timeout)s %(puppet_cmd)s" % dict( if TIMEOUT_CMD:
timeout=pipes.quote(p['timeout']), puppet_cmd=PUPPET_CMD) base_cmd = "%(timeout_cmd)s -s 9 %(timeout)s %(puppet_cmd)s" % dict(
timeout_cmd=TIMEOUT_CMD,
timeout=pipes.quote(p['timeout']),
puppet_cmd=PUPPET_CMD)
else:
base_cmd = PUPPET_CMD
if not p['manifest']: if not p['manifest']:
cmd = ("%(base_cmd)s agent --onetime" cmd = ("%(base_cmd)s agent --onetime"
" --ignorecache --no-daemonize --no-usecacheonfailure --no-splay" " --ignorecache --no-daemonize --no-usecacheonfailure"
" --detailed-exitcodes --verbose") % dict( " --no-splay --detailed-exitcodes --verbose") % dict(
base_cmd=base_cmd, base_cmd=base_cmd,
) )
if p['puppetmaster']: if p['puppetmaster']:
cmd += " --server %s" % pipes.quote(p['puppetmaster']) cmd += " --server %s" % pipes.quote(p['puppetmaster'])
if p['show_diff']: if p['show_diff']:
cmd += " --show_diff" cmd += " --show-diff"
if p['environment']: if p['environment']:
cmd += " --environment '%s'" % p['environment'] cmd += " --environment '%s'" % p['environment']
if module.check_mode: if module.check_mode: