cucumber-chef 3.0.0.rc.5 → 3.0.0

data/lib/cucumber/chef/provisioner.rb

@@ -47,7 +47,7 @@ module Cucumber
         wait_for_chef_server
 
         download_chef_credentials
-        download_proxy_ssh_credentials
+        download_ssh_credentials
 
         reboot_test_lab
       end
@@ -71,11 +71,11 @@ module Cucumber
           # if it is not in place mkdir fails with Net::SFTP::StatusException on
           # the Net::SFTP mkdir internal call triggered by a Net::SFTP upload
           # call
-          @test_lab.bootstrap_ssh.exec(%(rm -rf #{remote_path}))
+          @test_lab.bootstrap_ssh.exec(%(sudo rm -vrf #{remote_path}), :silence => true)
           begin
             @test_lab.bootstrap_ssh.upload(local_path, remote_path)
           rescue Net::SFTP::StatusException => e
-            @test_lab.bootstrap_ssh.exec(%(mkdir -p #{remote_path}))
+            @test_lab.bootstrap_ssh.exec(%(mkdir -vp #{remote_path}), :silence => true)
             retry
           end
         end
@@ -87,44 +87,55 @@ module Cucumber
         raise ProvisionerError, "You must have the environment variable 'USER' set." if !Cucumber::Chef::Config.user
 
         ZTK::Benchmark.bench(:message => "Bootstrapping #{Cucumber::Chef::Config.provider.upcase} instance", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-          chef_client_attributes = if Cucumber::Chef.chef_pre_11
+
+          chef_solo_attributes = case Cucumber::Chef.chef_pre_11
+          when true then
             {
-              "run_list" => %w(role[test_lab] recipe[chef-server::default] recipe[chef-server::apache-proxy] recipe[chef-client]),
-              "cucumber_chef" => {
-                "version" => Cucumber::Chef::VERSION,
-                "prerelease" => Cucumber::Chef::Config.prerelease,
-                "lab_user" => Cucumber::Chef.lab_user,
-                "lxc_user" => Cucumber::Chef.lxc_user
-              },
               "chef-server" => {
                 "webui_enabled" => true
-              }
+              },
+              "run_list" => %w(recipe[chef-server::rubygems-install] recipe[chef-server::apache-proxy] role[test_lab])
             }
-          else
+          when false then
             {
-              "run_list" => %w(role[test_lab]),
-              "cucumber_chef" => {
-                "version" => Cucumber::Chef::VERSION,
-                "prerelease" => Cucumber::Chef::Config.prerelease,
-                "lab_user" => Cucumber::Chef.lab_user,
-                "lxc_user" => Cucumber::Chef.lxc_user
-              }
+              "chef-server" => {
+                "nginx" => {
+                  "enable_non_ssl" => true,
+                  "server_name" => "localhost",
+                  "url" => "http://localhost"
+                },
+                "chef_server_webui" => {
+                  "enable" => true
+                }
+              },
+              "run_list" => %w(recipe[chef-server::default] role[test_lab])
             }
           end
 
+          chef_solo_attributes.merge!(
+            "cucumber_chef" => {
+              "version" => Cucumber::Chef::VERSION,
+              "prerelease" => Cucumber::Chef::Config.prerelease,
+              "lab_user" => Cucumber::Chef.lab_user,
+              "lxc_user" => Cucumber::Chef.lxc_user
+            }
+          )
+
           context = {
-            :chef_client_attributes => chef_client_attributes,
-            :amqp_password => Cucumber::Chef::Config.chef[:amqp_password],
-            :admin_password => Cucumber::Chef::Config.chef[:admin_password],
+            :lab_user => Cucumber::Chef.lab_user,
+            :chef_pre_11 => Cucumber::Chef.chef_pre_11,
+            :chef_solo_attributes => chef_solo_attributes,
+            :chef_version => Cucumber::Chef::Config.chef[:version],
+            :chef_validator => (Cucumber::Chef.chef_pre_11 ? '/etc/chef/validation.pem' : '/etc/chef-server/chef-validator.pem'),
+            :chef_webui => (Cucumber::Chef.chef_pre_11 ? '/etc/chef/webui.pem' : '/etc/chef-server/chef-webui.pem'),
+            :chef_admin => (Cucumber::Chef.chef_pre_11 ? '/etc/chef/admin.pem' : '/etc/chef-server/admin.pem'),
+            :default_password => Cucumber::Chef::Config.chef[:default_password],
             :user => Cucumber::Chef::Config.user,
             :hostname_short => Cucumber::Chef.lab_hostname_short,
-            :hostname_full => Cucumber::Chef.lab_hostname_full,
-            :chef_server_version => Cucumber::Chef::Config.chef[:server_version],
-            :chef_client_version => Cucumber::Chef::Config.chef[:client_version]
+            :hostname_full => Cucumber::Chef.lab_hostname_full
           }
 
-          bootstrap_template_file = (Cucumber::Chef.chef_pre_11 ? 'ubuntu-precise-apt.erb' : 'ubuntu-precise-omnibus.erb')
-          bootstrap_template = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "bootstrap", bootstrap_template_file)
+          bootstrap_template = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "bootstrap", "ubuntu-precise-omnibus.erb")
 
           local_bootstrap_file = Tempfile.new("bootstrap")
           local_bootstrap_filename = local_bootstrap_file.path
@@ -145,11 +156,11 @@ module Cucumber
 ################################################################################
 
       def download_chef_credentials
-        ZTK::Benchmark.bench(:message => "Downloading chef-server credentials", :mark => "completed in %0.4f seconds.", :ui => @ui) do
+        ZTK::Benchmark.bench(:message => "Downloading chef credentials", :mark => "completed in %0.4f seconds.", :ui => @ui) do
           local_path = File.dirname(Cucumber::Chef.chef_identity)
           @ui.logger.debug { "local_path == #{local_path.inspect}" }
 
-          remote_path = File.join(Cucumber::Chef.lab_user_home_dir, ".chef")
+          remote_path = File.join(Cucumber::Chef.bootstrap_user_home_dir, ".chef")
           @ui.logger.debug { "remote_path == #{remote_path.inspect}" }
 
           files = [ File.basename(Cucumber::Chef.chef_identity) ]
@@ -168,48 +179,35 @@ module Cucumber
 
 ################################################################################
 
-      def download_proxy_ssh_credentials
-        ZTK::Benchmark.bench(:message => "Downloading proxy SSH credentials", :mark => "completed in %0.4f seconds.", :ui => @ui) do
+      def download_ssh_credentials
+        ZTK::Benchmark.bench(:message => "Downloading SSH credentials", :mark => "completed in %0.4f seconds.", :ui => @ui) do
           local_path = File.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config.provider.to_s)
-          remote_path = File.join(Cucumber::Chef.lab_user_home_dir, ".ssh")
-
-          files = { "id_rsa" => "id_rsa-#{@test_lab.bootstrap_ssh.config.user}" }
-          files.each do |remote_file, local_file|
-            local = File.join(local_path, local_file)
-            File.exists?(local) and File.delete(local)
-            @test_lab.bootstrap_ssh.download(File.join(remote_path, remote_file), local)
-            File.chmod(0600, local)
-          end
-        end
-      end
 
-################################################################################
+          users = {
+            Cucumber::Chef.lab_user => Cucumber::Chef.lab_user_home_dir,
+            Cucumber::Chef.lxc_user => Cucumber::Chef.lxc_user_home_dir
+          }
 
-      def chef_first_run
-        ZTK::Benchmark.bench(:message => "Performing chef-client run", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-          log_level = (ENV['LOG_LEVEL'].downcase rescue (Cucumber::Chef.is_rc? ? "debug" : "info"))
+          users.each do |username, home_dir|
+            identity_file = File.join(home_dir, ".ssh", "id_rsa")
+            temp_file = File.join("/tmp", "id_rsa-#{username}")
+            local_file = File.join(local_path, "id_rsa-#{username}")
 
-          command = "/usr/bin/chef-client -j /etc/chef/first-boot.json --log_level #{log_level} --once"
-          command = "sudo #{command}"
-          @test_lab.bootstrap_ssh.exec(command, :silence => true)
+            @test_lab.bootstrap_ssh.exec(%(sudo cp -v #{identity_file} #{temp_file}), :silence => true)
+            @test_lab.bootstrap_ssh.exec(%(sudo chown -v #{Cucumber::Chef.bootstrap_user}:#{Cucumber::Chef.bootstrap_user} #{temp_file}), :silence => true)
+
+            File.exists?(local_file) and File.delete(local_file)
+            @test_lab.bootstrap_ssh.download(temp_file, local_file)
+            File.chmod(0600, local_file)
+          end
         end
       end
 
 ################################################################################
 
       def wait_for_chef_server
-        if (Cucumber::Chef.chef_pre_11 == true)
-          ZTK::Benchmark.bench(:message => "Waiting for the chef-server", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-            ZTK::TCPSocketCheck.new(:host => @test_lab.ip, :port => 4000, :data => "GET", :wait => 120).wait
-          end
-
-          ZTK::Benchmark.bench(:message => "Waiting for the chef-server-webui", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-            ZTK::TCPSocketCheck.new(:host => @test_lab.ip, :port => 4040, :data => "GET", :wait => 120).wait
-          end
-        else
-          ZTK::Benchmark.bench(:message => "Waiting for the chef-server nginx daemon", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-            ZTK::TCPSocketCheck.new(:host => @test_lab.ip, :port => 80, :data => "GET", :wait => 120).wait
-          end
+        ZTK::Benchmark.bench(:message => "Waiting for the chef-server-api HTTPS", :mark => "responded after %0.4f seconds.", :ui => @ui) do
+          ZTK::TCPSocketCheck.new(:host => @test_lab.ip, :port => 443, :data => "GET", :wait => 120).wait
         end
       end
 

data/lib/cucumber/chef/templates/bootstrap/ubuntu-precise-omnibus.erb

@@ -1,80 +1,96 @@
 #!/bin/env bash
 #
-# Cucumber-Chef 'Chef >= 11.0.0' Bootstrap Script
+# Cucumber-Chef v<%= Cucumber::Chef::VERSION %> Bootstrap Script
 #
 # Generated <%= Time.now.utc %>
 #
 set -x
+export DEBIAN_FRONTEND="noninteractive"
+CHEF_SOLO_ROOT="/tmp/chef-solo"
+KNIFE_CONFIG_EXP_FILE="/tmp/knife-config.exp"
+cd ${CHEF_SOLO_ROOT}
 
-CUCUMBER_CHEF_BOOTSTRAP_DONE="/.cucumber-chef-bootstrap-finished"
-# [ -f ${CUCUMBER_CHEF_BOOTSTRAP_DONE} ] && echo "Already bootstrapped!" && exit
-
-export DEBIAN_FRONTEND=noninteractive
-cd /tmp
+grep "<%= @lab_user %>" /etc/sudoers
+if [ $? -eq 1 ]; then
+  echo "<%= @lab_user %> ALL=(ALL) NOPASSWD:ALL" | tee -a /etc/sudoers
+fi
 
 echo "127.0.0.1 <%= @hostname_full %> <%= @hostname_short %>" | tee -a /etc/hosts
 echo "<%= @hostname_full %>" | tee /etc/hostname
 hostname <%= @hostname_full %>
 
 apt-get -y --force-yes update
+apt-get -y --force-yes install build-essential expect
+
+mkdir -pv /etc/chef /var/log/chef ${HOME}/.chef
+
+cat <<EOF | tee /etc/chef/solo.rb
+file_cache_path "${CHEF_SOLO_ROOT}/"
+cookbook_path %w(${CHEF_SOLO_ROOT}/cookbooks/ ${CHEF_SOLO_ROOT}/site-cookbooks/)
+role_path "${CHEF_SOLO_ROOT}/roles/"
+EOF
+
+cat <<EOF | tee ${CHEF_SOLO_ROOT}/attributes.json
+<%= @chef_solo_attributes.to_json %>
+EOF
+
+wget -v http://www.opscode.com/chef/install.sh
+bash install.sh -v <%= @chef_version %>
+<% if (@chef_pre_11 == false) -%>
+
+mkdir -pv /var/chef/cache ${CHEF_SOLO_ROOT}/cookbooks/chef-server
+wget -qO- https://github.com/opscode-cookbooks/chef-server/archive/master.tar.gz | tar xvzC ${CHEF_SOLO_ROOT}/cookbooks/chef-server --strip-components=1
+<% else -%>
 
-cat <<EOF > /tmp/chef-server.json
-{
-  "chef-server": {
-    "version": "<%= @chef_server_version %>",
-    "nginx": {
-      "enable_non_ssl": true,
-      "server_name": "localhost",
-      "url": "http://localhost"
-    },
-    "chef_server_webui": {
-      "enable": true
-    }
-  },
-  "run_list": [ "recipe[chef-server::default]" ]
-}
+export PATH=/opt/chef/embedded/bin:$PATH
+
+cat <<EOF | tee ${CHEF_SOLO_ROOT}/Gemfile
+source 'https://rubygems.org'
+gem 'chef', '<%= @chef_version %>'
+gem 'berkshelf'
+gem 'moneta', '< 0.7.0'
+EOF
+
+cat <<EOF | tee ${CHEF_SOLO_ROOT}/Berksfile
+site :opscode
+cookbook 'chef-server'
 EOF
 
-wget http://www.opscode.com/chef/install.sh
-bash install.sh -v <%= @chef_client_version %>
-mkdir -p /var/chef/cache /var/chef/cookbooks/chef-server
-wget -qO- https://github.com/opscode-cookbooks/chef-server/archive/master.tar.gz | tar xvzC /var/chef/cookbooks/chef-server --strip-components=1
-chef-solo -j /tmp/chef-server.json
+gem install bundler --no-ri --no-rdoc
+bundle install --standalone --path vendor/bundle --binstubs
+mv -v ${CHEF_SOLO_ROOT}/cookbooks ${CHEF_SOLO_ROOT}/site-cookbooks
+bin/berks install --path ${CHEF_SOLO_ROOT}/cookbooks/
+<% end -%>
 
-echo -n "Waiting on chef-validator.pem and chef-webui.pem to appear..."
-until [ -f /etc/chef-server/chef-validator.pem ] && [ -f /etc/chef-server/chef-webui.pem ]; do
+chef-solo --config /etc/chef/solo.rb --json-attributes ${CHEF_SOLO_ROOT}/attributes.json --logfile /var/log/chef/chef-solo.log --log_level debug
+
+echo -n "Waiting on <%= File.basename(@chef_validator) %> and <%= File.basename(@chef_webui) %> to appear..."
+until [ -f <%= @chef_validator %> ] && [ -f <%= @chef_webui %> ]; do
   echo -n "."
   sleep 1
 done
 echo "done."
 
-ln -s /etc/chef-server/chef-validator.pem /etc/chef/validation.pem
-ln -s /etc/chef-server/admin.pem /etc/chef/admin.pem
+cp -v <%= @chef_validator %> <%= @chef_webui %> ~/.chef
 
-mkdir -p ~/.chef
-cp /etc/chef-server/chef-validator.pem /etc/chef-server/chef-webui.pem ~/.chef
+<% if (@chef_pre_11 == false) -%>
+ln -sv <%= @chef_validator %> /etc/chef/validation.pem
+ln -sv <%= @chef_admin %> /etc/chef/admin.pem
+<% end -%>
 
-apt-get -y --force-yes install expect
-KNIFE_CONFIG_EXP_FILE="/tmp/knife-config.exp"
-cat <<EOF > ${KNIFE_CONFIG_EXP_FILE}
+cat <<EOF | tee ${KNIFE_CONFIG_EXP_FILE}
 #!/usr/bin/expect -f
 set timeout 10
-spawn knife configure -i --server-url https://127.0.0.1 --admin-client-key /etc/chef-server/admin.pem -u ${SUDO_USER} -r '' --defaults --yes -VV
-expect "Please enter a password for the new user:" { send "p@ssw0rd1\n" }
+<% if (@chef_pre_11 == false) -%>
+spawn knife configure -i --server-url https://127.0.0.1 --admin-client-key <%= @chef_admin %> -u ${SUDO_USER} -r '' --defaults --yes -VV
+<% else -%>
+spawn knife configure -i --server-url https://127.0.0.1 -u ${SUDO_USER} -r '' --defaults --yes -VV
+<% end -%>
+expect "Please enter a password for the new user:" { send "<%= @default_password %>\n" }
 interact
 EOF
 chmod +x ${KNIFE_CONFIG_EXP_FILE}
 ${KNIFE_CONFIG_EXP_FILE}
 
 knife client create <%= @user %> -a -f ${HOME}/.chef/<%= @user %>.pem --disable-editing --yes -VV
-chown -R ${SUDO_USER}:${SUDO_USER} ${HOME}
-
-knife cookbook upload --all --cookbook-path /tmp/chef-solo/cookbooks --force --yes -VV
-knife role from file /tmp/chef-solo/roles/*.rb --yes -VV
-
-cat <<EOF > /etc/chef/bootstrap-chef-client.json
-<%= @chef_client_attributes.to_json %>
-EOF
-chef-client -j /etc/chef/bootstrap-chef-client.json --validation_key /etc/chef-server/chef-validator.pem --server https://127.0.0.1
-
-touch ${CUCUMBER_CHEF_BOOTSTRAP_DONE}
+chown -Rv ${SUDO_USER}:${SUDO_USER} ${HOME}

data/lib/cucumber/chef/templates/cucumber-chef/Vagrantfile.erb

@@ -0,0 +1,32 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Auto-generated by cucumber-chef v#{Cucumber::Chef::VERSION} on #{Time.now.utc} -- DO NOT EDIT!
+
+# Vagrant v1 Configuration
+###########################
+Vagrant::Config.run do |config|
+  config.vm.define "test-lab-#{ENV['USER']}".downcase do |test_lab|
+    test_lab.vm.box = "precise64"
+    test_lab.vm.box_url = "http://files.vagrantup.com/precise64.box"
+    test_lab.vm.network :hostonly, "<%= @ip %>"
+
+    test_lab.vm.customize ["modifyvm", :id, "--cpus", <%= @cpus %>]
+    test_lab.vm.customize ["modifyvm", :id, "--memory", <%= @memory %>]
+  end
+end
+
+# Vagrant v2 Configuration
+###########################
+Vagrant.configure("2") do |config|
+  config.vm.define "test-lab-#{ENV['USER']}".downcase do |test_lab|
+    test_lab.vm.box = "precise64"
+    test_lab.vm.box_url = "http://files.vagrantup.com/precise64.box"
+    test_lab.vm.network :private_network, :ip => "<%= @ip %>"
+
+    test_lab.vm.provider :virtualbox do |vb|
+      vb.customize ["modifyvm", :id, "--cpus", <%= @cpus %>]
+      vb.customize ["modifyvm", :id, "--memory", <%= @memory %>]
+    end
+  end
+end

data/lib/cucumber/chef/templates/cucumber-chef/config-rb.erb

@@ -1,39 +1,29 @@
-################################################################################
-# Cucumber-Chef
-################################################################################
+# If you want to customize configuration options do so here:
+
+# provider        :vagrant
+
+# vagrant.merge!( :identity_file => "#{ENV['HOME']}/.vagrant.d/insecure_private_key",
+#                 :ssh => {
+#                     :lab_ip => "192.168.33.10",
+#                     :lab_port => 22,
+#                     :lxc_port => 22
+#                 },
+#                 :cpus => 4,
+#                 :memory => 4096 )
+
+# aws.merge!(     :identity_file => ENV['AWS_IDENTITY'],
+#                 :ssh => {
+#                     :lab_port => 22,
+#                     :lxc_port => 22
+#                 },
+#                 :aws_access_key_id => ENV['AWS_ACCESS_KEY_ID'],
+#                 :aws_secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'],
+#                 :aws_ssh_key_id => ENV['AWS_SSH_KEY_ID'],
+#                 :region => "us-west-2",
+#                 :availability_zone => "us-west-2a",
+#                 :aws_instance_arch => "i386",
+#                 :aws_instance_type => "c1.medium" )
+
+# artifacts       ({ "chef-client-log" => "/var/log/chef/client.log",
+#                    "chef-client-stacktrace" => "/var/chef/cache/chef-stacktrace.out" })
 
-provider                        :aws
-librarian_chef                  <%= @librarian_chef %>
-lxc_user                        "root"
-lab_user                        "ubuntu"
-prerelease                      <%= @is_rc %>
-
-artifacts                       ({ "chef-client-log" => "/var/log/chef/client.log",
-                                   "chef-client-stacktrace" => "/var/chef/cache/chef-stacktrace.out" })
-
-
-################################################################################
-# Provider: AWS
-################################################################################
-
-aws[:aws_access_key_id]         = "<%= @aws_access_key %>"
-aws[:aws_secret_access_key]     = "<%= @aws_secret_access_key %>"
-
-aws[:aws_ssh_key_id]            = "<%= @aws_ssh_id %>"
-aws[:identity_file]             = "<%= File.join(@aws_ssh_key_dir, @aws_ssh_key) %>"
-
-aws[:region]                    = "<%= @region %>-1"
-aws[:availability_zone]         = "<%= @region %>-1a"
-
-#aws[:aws_instance_arch]         = "i386"
-#aws[:aws_instance_disk_store]   = "instance-store"
-#aws[:aws_instance_type]         = "m1.small"
-
-#aws[:aws_security_group]        = "cucumber-chef"
-
-
-################################################################################
-# Provider: Vagrant
-################################################################################
-
-# TODO

data/lib/cucumber/chef/utility.rb

@@ -87,7 +87,8 @@ module Cucumber
 ################################################################################
 
       def chef_pre_11
-        (Cucumber::Chef::Config.chef[:server_version].to_f < 11.0)
+        return false if (Cucumber::Chef::Config.chef[:version].downcase == "latest")
+        (Cucumber::Chef::Config.chef[:version].to_f < 11.0)
       end
 
 ################################################################################
@@ -173,7 +174,12 @@ module Cucumber
 ################################################################################
 
       def bootstrap_user
-        Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:lab_user]
+        Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:bootstrap_user]
+      end
+
+      def bootstrap_user_home_dir
+        user = Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:bootstrap_user]
+        ((user == "root") ? "/root" : "/home/#{user}")
       end
 
       def bootstrap_identity
@@ -201,6 +207,10 @@ module Cucumber
         lab_identity
       end
 
+      def lab_ip
+        Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:ssh][:lab_ip]
+      end
+
       def lab_ssh_port
         Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:ssh][:lab_port]
       end
@@ -227,7 +237,7 @@ module Cucumber
       end
 
       def lxc_identity
-        lxc_identity = File.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config.provider.to_s, "id_rsa-#{lab_user}")
+        lxc_identity = File.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config.provider.to_s, "id_rsa-#{lxc_user}")
         File.exists?(lxc_identity) && File.chmod(0400, lxc_identity)
         lxc_identity
       end