1. Adding some new helper files that split off file inclusion, templating, importing, constant usage.

1. Move all datasources to a new sources directory
1. Rename some files to be more consistent with python file/module naming.

1 files changed, 119 insertions, 0 deletions

diff --git a/cloudinit/handlers/cc_chef.py b/cloudinit/handlers/cc_chef.py
new file mode 100644
index 00000000..941e04fe
--- /dev/null
+++ b/cloudinit/handlers/cc_chef.py
@@ -0,0 +1,119 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
+#
+#    Author: Avishai Ish-Shalom <avishai@fewbytes.com>
+#    Author: Mike Moulton <mike@meltmedia.com>
+#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
+#
+#    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 subprocess
+import json
+import cloudinit.CloudConfig as cc
+import cloudinit.util as util
+
+ruby_version_default = "1.8"
+
+
+def handle(_name, cfg, cloud, log, _args):
+    # If there isn't a chef key in the configuration don't do anything
+    if 'chef' not in cfg:
+        return
+    chef_cfg = cfg['chef']
+
+    # ensure the chef directories we use exist
+    mkdirs(['/etc/chef', '/var/log/chef', '/var/lib/chef',
+            '/var/cache/chef', '/var/backups/chef', '/var/run/chef'])
+
+    # set the validation key based on the presence of either 'validation_key'
+    # or 'validation_cert'. In the case where both exist, 'validation_key'
+    # takes precedence
+    for key in ('validation_key', 'validation_cert'):
+        if key in chef_cfg and chef_cfg[key]:
+            with open('/etc/chef/validation.pem', 'w') as validation_key_fh:
+                validation_key_fh.write(chef_cfg[key])
+            break
+
+    # create the chef config from template
+    util.render_to_file('chef_client.rb', '/etc/chef/client.rb',
+        {'server_url': chef_cfg['server_url'],
+         'node_name': util.get_cfg_option_str(chef_cfg, 'node_name',
+                                          cloud.datasource.get_instance_id()),
+         'environment': util.get_cfg_option_str(chef_cfg, 'environment',
+                                                '_default'),
+         'validation_name': chef_cfg['validation_name']})
+
+    # set the firstboot json
+    with open('/etc/chef/firstboot.json', 'w') as firstboot_json_fh:
+        initial_json = {}
+        if 'run_list' in chef_cfg:
+            initial_json['run_list'] = chef_cfg['run_list']
+        if 'initial_attributes' in chef_cfg:
+            initial_attributes = chef_cfg['initial_attributes']
+            for k in initial_attributes.keys():
+                initial_json[k] = initial_attributes[k]
+        firstboot_json_fh.write(json.dumps(initial_json))
+
+    # If chef is not installed, we install chef based on 'install_type'
+    if not os.path.isfile('/usr/bin/chef-client'):
+        install_type = util.get_cfg_option_str(chef_cfg, 'install_type',
+                                               'packages')
+        if install_type == "gems":
+            # this will install and run the chef-client from gems
+            chef_version = util.get_cfg_option_str(chef_cfg, 'version', None)
+            ruby_version = util.get_cfg_option_str(chef_cfg, 'ruby_version',
+                                                   ruby_version_default)
+            install_chef_from_gems(ruby_version, chef_version)
+            # and finally, run chef-client
+            log.debug('running chef-client')
+            subprocess.check_call(['/usr/bin/chef-client', '-d', '-i', '1800',
+                                   '-s', '20'])
+        else:
+            # this will install and run the chef-client from packages
+            cc.install_packages(('chef',))
+
+
+def get_ruby_packages(version):
+    # return a list of packages needed to install ruby at version
+    pkgs = ['ruby%s' % version, 'ruby%s-dev' % version]
+    if version == "1.8":
+        pkgs.extend(('libopenssl-ruby1.8', 'rubygems1.8'))
+    return(pkgs)
+
+
+def install_chef_from_gems(ruby_version, chef_version=None):
+    cc.install_packages(get_ruby_packages(ruby_version))
+    if not os.path.exists('/usr/bin/gem'):
+        os.symlink('/usr/bin/gem%s' % ruby_version, '/usr/bin/gem')
+    if not os.path.exists('/usr/bin/ruby'):
+        os.symlink('/usr/bin/ruby%s' % ruby_version, '/usr/bin/ruby')
+    if chef_version:
+        subprocess.check_call(['/usr/bin/gem', 'install', 'chef',
+                               '-v %s' % chef_version, '--no-ri',
+                               '--no-rdoc', '--bindir', '/usr/bin', '-q'])
+    else:
+        subprocess.check_call(['/usr/bin/gem', 'install', 'chef',
+                               '--no-ri', '--no-rdoc', '--bindir',
+                               '/usr/bin', '-q'])
+
+
+def ensure_dir(d):
+    if not os.path.exists(d):
+        os.makedirs(d)
+
+
+def mkdirs(dirs):
+    for d in dirs:
+        ensure_dir(d)