Update puppet to replace rather than append, add mcollective [Marc Cluet]

Modified puppet module to try to replace values on the existing file instead of adding new values to the end.
Also added initial mcollective module

1 files changed, 22 insertions, 4 deletions

diff --git a/cloudinit/CloudConfig/cc_puppet.py b/cloudinit/CloudConfig/cc_puppet.py
index b498c5f0..c458365d 100644
--- a/cloudinit/CloudConfig/cc_puppet.py
+++ b/cloudinit/CloudConfig/cc_puppet.py
@@ -19,6 +19,8 @@ import os
 import pwd
 import socket
 import subprocess
+import StringIO
+import ConfigParser
 import cloudinit.CloudConfig as cc
 
 def handle(name,cfg,cloud,log,args):
@@ -31,7 +33,13 @@ def handle(name,cfg,cloud,log,args):
     # ... and then update the puppet configuration
     if puppet_cfg.has_key('conf'):
         # Add all sections from the conf object to puppet.conf
-        puppet_conf_fh = open('/etc/puppet/puppet.conf', 'a')
+        puppet_conf_fh = open('/etc/puppet/puppet.conf', 'r')
+        # Create object for reading puppet.conf values
+        puppet_config = ConfigParser.ConfigParser()
+        # Read puppet.conf values from original file in order to be able to mix the rest up
+        puppet_config.readfp(StringIO.StringIO(''.join(i.lstrip() for i in puppet_conf_fh.readlines())))
+        # Close original file, no longer needed
+        puppet_conf_fh.close()
         for cfg_name, cfg in puppet_cfg['conf'].iteritems():
             # ca_cert configuration is a special case
             # Dump the puppetmaster ca certificate in the correct place
@@ -51,7 +59,12 @@ def handle(name,cfg,cloud,log,args):
                 os.chown('/var/lib/puppet/ssl/certs/ca.pem',
                          pwd.getpwnam('puppet').pw_uid, 0)
             else:
-                puppet_conf_fh.write("\n[%s]\n" % (cfg_name))
+                #puppet_conf_fh.write("\n[%s]\n" % (cfg_name))
+                # If puppet.conf already has this section we don't want to write it again
+                if puppet_config.has_section(cfg_name) == False
+                    puppet_config.add_section(cfg_name)
+                # Iterate throug the config items, we'll use ConfigParser.set
+                # to overwrite or create new items as needed
                 for o, v in cfg.iteritems():
                     if o == 'certname':
                         # Expand %f as the fqdn
@@ -61,8 +74,13 @@ 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.close()
+                    puppet_config.set(cfg_name,o,v)
+                    #puppet_conf_fh.write("%s=%s\n" % (o, v))
+            # We got all our config as wanted we'll rename
+            # the previous puppet.conf and create our new one
+            os.rename('/etc/puppet/puppet.conf','/etc/puppet/puppet.conf.old')
+            with open('/etc/puppet/puppet.conf', 'wb') as configfile:
+                puppet_config.write(configfile)
     # Set puppet default file to automatically start
     subprocess.check_call(['sed', '-i',
                            '-e', 's/^START=.*/START=yes/',