summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2011-02-01 10:57:03 -0500
committerScott Moser <smoser@ubuntu.com>2011-02-01 10:57:03 -0500
commitac273a2a96c27975ce7b287054bd0ea934c66935 (patch)
tree4203bdb86c740eb15b974addbe86b591493240aa
parent15f9ebe6b19836efec0bec44b0826fcfcae230c5 (diff)
parentb17f551894e67d0fa07026f587c906b157810a9c (diff)
downloadvyos-cloud-init-ac273a2a96c27975ce7b287054bd0ea934c66935.tar.gz
vyos-cloud-init-ac273a2a96c27975ce7b287054bd0ea934c66935.zip
Fixes issue puppet configuration option values in quotes.
LP: #709946
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/CloudConfig/cc_puppet.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index caaedd2a..4cf2467c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
- add 'datasource' file to instance dir
- add setting of passwords and enabling/disabling of PasswordAuthentication
for sshd. By default no changes are done to sshd.
+ - fix for puppet configuration options (LP: #709946) [Ryan Lane]
0.6.0:
- change permissions of /var/log/cloud-init.log to accomodate
syslog writing to it (LP: #704509)
diff --git a/cloudinit/CloudConfig/cc_puppet.py b/cloudinit/CloudConfig/cc_puppet.py
index 8ccfb2df..9cfe7a49 100644
--- a/cloudinit/CloudConfig/cc_puppet.py
+++ b/cloudinit/CloudConfig/cc_puppet.py
@@ -67,7 +67,7 @@ def handle(name,cfg,cloud,log,args):
cloud.datasource.get_instance_id())
# certname needs to be downcase
v = v.lower()
- puppet_conf_fh.write("%s=\"%s\"\n" % (o, v))
+ puppet_conf_fh.write("%s=%s\n" % (o, v))
puppet_conf_fh.close()
# Set puppet default file to automatically start
subprocess.check_call(['sed', '-i',