Merge lp:~lynxman/cloud-init/puppet-mcollective into lp:~cloud-init-dev/cloud-init/trunk

[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

[Scott Moser (smoser)]

It looks good except, I'd like a doc/examples/cloud-config-mcollective.txt
or a section in doc/examples/cloud-config.txt that would explain the mcollective configurations.

review: Needs Fixing

=== added file 'cloudinit/CloudConfig/cc_mcollective.py'
--- cloudinit/CloudConfig/cc_mcollective.py	1970-01-01 00:00:00 +0000
+++ cloudinit/CloudConfig/cc_mcollective.py	2011-02-15 14:53:56 +0000
@@ -0,0 +1,63 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2009-2011 Canonical Ltd.
+#
+#    Author: Marc Cluet <[e-mail]>
+#    Based on code by Scott Moser <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import os
+import pwd
+import socket
+import subprocess
+import StringIO
+import ConfigParser
+import cloudinit.CloudConfig as cc
+
+# Our fake header section
+class FakeSecHead(object):
+   def __init__(self, fp):
+     self.fp = fp
+     self.sechead = '[nullsection]\n'
+   def readline(self):
+     if self.sechead:
+       try: return self.sechead
+       finally: self.sechead = None
+     else: return self.fp.readline()
+
+def handle(name,cfg,cloud,log,args):
+    # If there isn't a mcollective key in the configuration don't do anything
+    if not cfg.has_key('mcollective'): return
+    mcollective_cfg = cfg['mcollective']
+    # Start by installing the mcollective package ...
+    cc.install_packages(("mcollective",))
+
+    # ... and then update the mcollective configuration
+    if mcollective_cfg.has_key('conf'):
+        # Create object for reading server.cfg values
+        mcollective_config = ConfigParser.ConfigParser()
+        # Read server.cfg values from original file in order to be able to mix the rest up
+        mcollective_config.readfp(FakeSecHead(open('/etc/mcollective/server.cfg')))
+        for cfg_name, cfg in mcollective_cfg['conf'].iteritems():
+            # Iterate throug the config items, we'll use ConfigParser.set
+            # to overwrite or create new items as needed
+            for o, v in cfg.iteritems():
+                mcollective_config.set(cfg_name,o,v)
+            # We got all our config as wanted we'll rename
+            # the previous server.cfg and create our new one
+            os.rename('/etc/mcollective/server.cfg','/etc/mcollective/server.cfg.old')
+            with open('/etc/mcollective/server.cfg', 'wb') as configfile:
+                mcollective_config.write(configfile)
+    # Start mcollective
+    subprocess.check_call(['service', 'mcollective', 'start'])
+
 
=== modified file 'cloudinit/CloudConfig/cc_puppet.py'
--- cloudinit/CloudConfig/cc_puppet.py	2011-02-07 19:43:40 +0000
+++ cloudinit/CloudConfig/cc_puppet.py	2011-02-15 14:53:56 +0000
@@ -19,6 +19,8 @@
 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 @@
     # ... 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 @@
                 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 @@
                               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/',