pre-install required etcd gem before knife bootstrap using template-file option

Author: Gabriel Monroy

cm/chef.py

@@ -21,7 +21,7 @@
 CHEF_INSTALL_TYPE = 'gems'
 CHEF_RUBY_VERSION = '1.9.1'
 CHEF_ENVIRONMENT = '_default'
-CHEF_CLIENT_VERSION = '11.6.2'
+CHEF_CLIENT_VERSION = '11.8.2'
 
 # load chef config using CHEF_CONFIG_PATH
 try:
@@ -49,6 +49,14 @@
     _valid_pem_path = os.path.join(CHEF_CONFIG_PATH, 'validation.pem')
     CHEF_VALIDATION_KEY = subprocess.check_output(
         ['/bin/cat', _valid_pem_path]).strip('\n')
+    # write out knife template
+    if not os.path.exists('.chef'):
+        os.mkdir('.chef')
+    _template_src = os.path.abspath(os.path.join(__file__, '..', 'ubuntu12.04-gems.erb'))
+    with open(_template_src) as src:
+        _knife_template = os.path.abspath(os.path.join('.chef', 'knife-template.erb'))
+        with open(_knife_template, 'w') as f:
+            f.write(src.read())
 except Exception as err:
     msg = "Failed to auto-configure Chef -- {}".format(err)
     if os.environ.get('READTHEDOCS'):
@@ -91,6 +99,7 @@ def bootstrap_node(node):
         # build knife bootstrap command
         args = ['knife', 'bootstrap', node['fqdn']]
         args.extend(['--config', '/etc/chef/client.rb'])
+        args.extend(['--template-file', '.chef/knife-template.erb'])
         args.extend(['--identity-file', pk_path])
         args.extend(['--node-name', node['id']])
         args.extend(['--sudo', '--ssh-user', node['ssh_username']])
@@ -103,14 +112,13 @@ def bootstrap_node(node):
         args.extend(['|', 'tee', output_path])
         # TODO: figure out why home isn't being set correctly for knife exec
         env = os.environ.copy()
-        env['HOME'] = '/opt/deis'
+        env['HOME'] = '/var/lib/deis'
         # execute knife bootstrap
         p = subprocess.Popen(' '.join(args), env=env, shell=True)
         rc = p.wait()
         # always print knife output
         with open(output_path) as f:
-            output = f.read()
-        print(output)
+            output = str(f.read())
         # raise an exception if bootstrap failed
         if rc != 0 or 'incorrect password' in output:
             raise RuntimeError('Node Bootstrap Error:\n' + output)

cm/ubuntu12.04-gems.erb

@@ -0,0 +1,49 @@
+bash -c '
+<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+
+if [ ! -f /usr/bin/chef-client ]; then
+  aptitude update >/dev/null 2>&1
+  aptitude install -yq ruby ruby1.8-dev build-essential wget libruby1.8 rubygems >/dev/null 2>&1
+fi
+
+gem update --no-rdoc --no-ri >/dev/null 2>&1
+gem install ohai --no-rdoc --no-ri >/dev/null 2>&1
+gem install chef --no-rdoc --no-ri <%= bootstrap_version_string %> >/dev/null 2>&1
+
+# install gems required at load-time
+gem install etcd --no-rdoc --no-ri >/dev/null 2>/dev/null
+
+mkdir -p /etc/chef
+
+cat > /etc/chef/validation.pem <<'EOP'
+<%= validation_key %>
+EOP
+chmod 0600 /etc/chef/validation.pem
+
+<% if encrypted_data_bag_secret -%>
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+chmod 0600 /etc/chef/encrypted_data_bag_secret
+<% end -%>
+
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir -p /etc/chef/ohai/hints
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
+<%= hash.to_json %>
+EOP
+<% end -%>
+<% end -%>
+
+cat > /etc/chef/client.rb <<'EOP'
+<%= config_content %>
+EOP
+
+cat > /etc/chef/first-boot.json <<'EOP'
+<%= first_boot.to_json %>
+EOP
+
+<%= start_chef %>'