From 8cc1cd9126b2edb360dd0b3182dd9c283aabc0a3 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 16 Sep 2016 12:35:25 -0700 Subject: [PATCH] Simplify puppet cmd generation We were copy pastaing code in the puppet cmd generation for noop and environment handling. Collapse that to make code easier to read and hopefully avoid future bugs where only one side is edited. Local testing shows that puppet parses commands like: puppet apply test.pp --noop just fine. Change-Id: Ie7665f72b9327b6b834d358699addf2c60a95ec0 --- library/puppet | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/library/puppet b/library/puppet index 3b23610..3130686 100644 --- a/library/puppet +++ b/library/puppet @@ -191,27 +191,19 @@ def main(): ) if p['puppetmaster']: cmd += " --server %s" % pipes.quote(p['puppetmaster']) - if p['show_diff']: - cmd += " --show_diff" - if p['environment']: - cmd += " --environment '%s'" % p['environment'] - if module.check_mode or p['noop']: - cmd += " --noop" - else: - cmd += " --no-noop" else: cmd = "%s apply --detailed-exitcodes " % base_cmd - if p['show_diff']: - cmd += "--show_diff " - if p['logdest'] != 'stdout': - cmd += "--logdest %s " % p['logdest'] - if p['environment']: - cmd += "--environment '%s' " % p['environment'] - if module.check_mode or p['noop']: - cmd += "--noop " - else: - cmd += "--no-noop " cmd += pipes.quote(p['manifest']) + if p['logdest'] != 'stdout': + cmd += " --logdest %s" % p['logdest'] + if p['show_diff']: + cmd += " --show_diff" + if p['environment']: + cmd += " --environment '%s'" % p['environment'] + if module.check_mode or p['noop']: + cmd += " --noop" + else: + cmd += " --no-noop" rc, stdout, stderr = module.run_command(cmd) if rc == 0: