cloud-init

Merge lp:~rlane/cloud-init/lp709946 into lp:~cloud-init-dev/cloud-init/trunk

  1. lp709946
  2. Merge into trunk
Proposed by Ryan Lane
Status: Merged
Merge reported by: Scott Moser
Merged at revision: not available
Proposed branch: lp:~rlane/cloud-init/lp709946
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
cloudinit/CloudConfig/cc_puppet.py (+1/-1)
To merge this branch: bzr merge lp:~rlane/cloud-init/lp709946
Reviewer Review Type Date Requested Status
Scott Moser Approve
Review via email: mp+47921@code.launchpad.net

Description of the change

Fixes issue with broken puppet runs due to wrapping puppet configuration option values in quotes.

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

The patch looks fine. Thank you for finding and submitting a fix.

review: Approve
Revision history for this message
Ryan Lane (rlane) wrote :

Great. Thanks for merging it :).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/CloudConfig/cc_puppet.py'
2--- cloudinit/CloudConfig/cc_puppet.py 2010-09-07 22:27:27 +0000
3+++ cloudinit/CloudConfig/cc_puppet.py 2011-01-29 23:43:54 +0000
4@@ -67,7 +67,7 @@
5 cloud.datasource.get_instance_id())
6 # certname needs to be downcase
7 v = v.lower()
8- puppet_conf_fh.write("%s=\"%s\"\n" % (o, v))
9+ puppet_conf_fh.write("%s=%s\n" % (o, v))
10 puppet_conf_fh.close()
11 # Set puppet default file to automatically start
12 subprocess.check_call(['sed', '-i',