cucumber-chef 3.0.0.rc.2 → 3.0.0.rc.3

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/cucumber-chef.gemspec

@@ -38,8 +38,8 @@ Gem::Specification.new do |s|
   s.add_dependency("fog", ">= 1.3.1")
 
   # TDD
-  s.add_dependency("cucumber", ">= 1.2.0")
-  s.add_dependency("rspec", ">= 2.10.0")
+  s.add_dependency("cucumber", ">= 0")
+  s.add_dependency("rspec", ">= 0")
 
   # Support
   s.add_dependency("mixlib-config", ">= 1.1.2")

data/lib/cucumber/chef/config.rb

@@ -177,7 +177,8 @@ module Cucumber
       artifacts         ({"chef-client-log" => "/var/log/chef/client.log",
                           "chef-client-stacktrace" => "/var/chef/cache/chef-stacktrace.out"})
 
-      chef              ({:version => "10.18.2",
+      chef              ({:client_version => "10.18.2",
+                          :server_version => "10.18.2",
                           :amqp_password => "p@ssw0rd1",
                           :admin_password => "p@ssw0rd1",
                           :render_client_rb => true})
@@ -191,6 +192,10 @@ module Cucumber
 
       aws               ({:lab_user => "ubuntu",
                           :lxc_user => "root",
+                          :ssh => {
+                            :lab_port => 22,
+                            :lxc_port => 22
+                          },
                           :ubuntu_release => "precise",
                           :aws_instance_arch => "i386",
                           :aws_instance_disk_store => "ebs",
@@ -198,7 +203,11 @@ module Cucumber
                           :aws_security_group => "cucumber-chef"})
 
       vagrant           ({:lab_user => "vagrant",
-                          :lxc_user => "root"})
+                          :lxc_user => "root",
+                          :ssh => {
+                            :lab_port => 2222,
+                            :lxc_port => 22
+                          } })
 
 ################################################################################
 

data/lib/cucumber/chef/containers.rb

@@ -229,7 +229,7 @@ module Cucumber
             @test_lab.bootstrap_ssh.exec(%(sudo chroot #{cache_rootfs} /bin/bash -c 'locale-gen'), :silence => true)
             @test_lab.bootstrap_ssh.exec(%(sudo chroot #{cache_rootfs} /bin/bash -c 'locale-gen en_US'), :silence => true)
             @test_lab.bootstrap_ssh.exec(%(sudo chroot #{cache_rootfs} /bin/bash -c 'wget http://www.opscode.com/chef/install.sh'), :silence => true)
-            @test_lab.bootstrap_ssh.exec(%(sudo chroot #{cache_rootfs} /bin/bash -c 'bash install.sh -v #{Cucumber::Chef::Config.chef[:version]}'), :silence => true)
+            @test_lab.bootstrap_ssh.exec(%(sudo chroot #{cache_rootfs} /bin/bash -c 'bash install.sh -v #{Cucumber::Chef::Config.chef[:server_version]}'), :silence => true)
             if distro.downcase == "fedora"
               @test_lab.bootstrap_ssh.exec(%(sudo chroot #{cache_rootfs} /bin/bash -c 'rpm -Uvh --nodeps /tmp/*rpm'), :silence => true)
             end

data/lib/cucumber/chef/provider.rb

@@ -27,7 +27,7 @@ module Cucumber
     class ProviderError < Error; end
 
     class Provider
-      PROXY_METHODS = %w(create destroy up down reload status id state username ip port chef_server_api chef_server_webui alive? dead? exists?)
+      PROXY_METHODS = %w(create destroy up down reload status id state username ip port alive? dead? exists?)
 
 ################################################################################
 
@@ -44,18 +44,10 @@ module Cucumber
 
 ################################################################################
 
-      def chef_server_webui
-        "http://#{ip}:4040"
-      end
-
-      def chef_server_api
-        "http://#{ip}:4000"
-      end
-
       def status
         if exists?
 
-          headers = [:provider, :id, :state, :username, :"ip address", :port, :"chef-server api", :"chef-server webui", :"chef-server default user", :"chef-server default password"]
+          headers = %w(provider id state username ip_address ssh_port).map(&:to_sym)
           results = ZTK::Report.new.list([nil], headers) do |noop|
 
             OpenStruct.new(
@@ -63,12 +55,8 @@ module Cucumber
               :id => self.id,
               :state => self.state,
               :username => self.username,
-              :"ip address" => self.ip,
-              :port => self.port,
-              :"chef-server api" => self.chef_server_api,
-              :"chef-server webui" => self.chef_server_webui,
-              :"chef-server default user" => "admin",
-              :"chef-server default password" => Cucumber::Chef::Config.chef[:admin_password]
+              :ip_address => self.ip,
+              :ssh_port => self.port
             )
           end
         else
@@ -81,6 +69,12 @@ module Cucumber
         raise ProviderError, e.message
       end
 
+################################################################################
+
+      def port
+        (Cucumber::Chef.lab_ssh_port || super(:port))
+      end
+
 ################################################################################
 
       def method_missing(method_name, *method_args)

data/lib/cucumber/chef/providers/vagrant.rb

@@ -36,9 +36,6 @@ module Cucumber
 
         def initialize(ui=ZTK::UI.new)
           @ui = ui
-
-          # @env = ::Vagrant::Environment.new
-          # @vm = @env.primary_vm
         end
 
 ################################################################################
@@ -145,7 +142,6 @@ module Cucumber
 ################################################################################
 
         def id
-          # @vm.name
           "default"
         end
 
@@ -162,17 +158,14 @@ module Cucumber
         end
 
         def username
-          # @vm.config.ssh.username
           "vagrant"
         end
 
         def ip
-          # @vm.config.ssh.host
           "127.0.0.1"
         end
 
         def port
-          # @vm.config.vm.forwarded_ports.select{ |fwd_port| (fwd_port[:name] == "ssh") }.first[:hostport].to_i
           2222
         end
 

data/lib/cucumber/chef/provisioner.rb

@@ -37,7 +37,10 @@ module Cucumber
 
         @cookbooks_path = File.join(Cucumber::Chef.root_dir, "chef_repo", "cookbooks")
         @roles_path = File.join(Cucumber::Chef.root_dir, "chef_repo", "roles")
-        @bootstrap_template = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "bootstrap", "ubuntu-precise-test-lab.erb")
+
+        @chef_pre_11 = (Cucumber::Chef::Config.chef[:server_version].to_f < 11.0)
+        bootstrap_template_file = (@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)
       end
 
 ################################################################################
@@ -66,22 +69,15 @@ module Cucumber
           remote_path = File.join("/tmp", "chef-solo")
           @ui.logger.debug { "remote_path == #{remote_path.inspect}" }
 
-          glob_dir = File.join(local_path, "**")
-          @ui.logger.debug { "glob_dir == #{glob_dir.inspect}" }
-
-          @test_lab.bootstrap_ssh.exec(%(mkdir -p #{remote_path}))
-
-          Dir.glob(glob_dir).each do |file|
-            file = File.basename(file)
-            @ui.logger.debug { "file == #{file.inspect}" }
-
-            local_file = File.join(local_path, file)
-            remote_file = File.join(remote_path, file)
+          @test_lab.bootstrap_ssh.exec(%(rm -rf #{remote_path} ; mkdir -p #{remote_path}))
+          @test_lab.bootstrap_ssh.upload(local_path, remote_path)
 
-            File.directory?(local_file) and @test_lab.bootstrap_ssh.exec(%(mkdir -p #{remote_file}))
+          # %w(Gemfile Gemfile.lock).each do |file|
+          #   local_file = File.join(Cucumber::Chef.chef_repo, file)
+          #   remote_file = File.join(remote_path, file)
 
-            @test_lab.bootstrap_ssh.upload(local_file, remote_file)
-          end
+          #   @test_lab.bootstrap_ssh.upload(local_file, remote_file)
+          # end
         end
       end
 
@@ -92,20 +88,13 @@ module Cucumber
 
         ZTK::Benchmark.bench(:message => "Bootstrapping #{Cucumber::Chef::Config.provider.upcase} instance", :mark => "completed in %0.4f seconds.", :ui => @ui) do
           chef_client_attributes = {
-            "run_list" => %w(recipe[chef-server::rubygems-install] recipe[chef-server] recipe[chef-client] role[test_lab]),
+            "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" => {
-              "webui_enabled" => true
-            },
-            "chef_client" => {
-              "interval" => 900,
-              "splay" => 900
-            }
+            "lxc_user" => Cucumber::Chef.lxc_user
           }
 
           context = {
@@ -115,7 +104,8 @@ module Cucumber
             :user => Cucumber::Chef::Config.user,
             :hostname_short => Cucumber::Chef.lab_hostname_short,
             :hostname_full => Cucumber::Chef.lab_hostname_full,
-            :chef_version => Cucumber::Chef::Config.chef[:version]
+            :chef_server_version => Cucumber::Chef::Config.chef[:server_version],
+            :chef_client_version => Cucumber::Chef::Config.chef[:client_version]
           }
 
           local_bootstrap_file = Tempfile.new("bootstrap")
@@ -144,7 +134,12 @@ module Cucumber
           remote_path = File.join(Cucumber::Chef.lab_user_home_dir, ".chef")
           @ui.logger.debug { "remote_path == #{remote_path.inspect}" }
 
-          files = [ File.basename(Cucumber::Chef.chef_identity), "validation.pem" ]
+          files = [ File.basename(Cucumber::Chef.chef_identity) ]
+          if (@chef_pre_11 == true)
+            files << "validation.pem"
+          else
+            files << "chef-validator.pem"
+          end
           files.each do |file|
             @ui.logger.debug { "file == #{file.inspect}" }
 
@@ -172,13 +167,31 @@ module Cucumber
 
 ################################################################################
 
-      def wait_for_chef_server
-        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
+      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"))
+
+          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)
         end
+      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
+################################################################################
+
+      def wait_for_chef_server
+        if (@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 => 8080, :data => "GET", :wait => 120).wait
+          end
         end
       end
 

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

@@ -0,0 +1,193 @@
+#!/bin/env bash
+#
+# Cucumber-Chef 'Chef < 11.0.0' Bootstrap Script
+#
+# Generated <%= Time.now.utc %>
+#
+set -x
+
+CUCUMBER_CHEF_BOOTSTRAP_DONE="/.cucumber-chef-bootstrap-finished"
+# [ -f ${CUCUMBER_CHEF_BOOTSTRAP_DONE} ] && echo "Already bootstrapped!" && exit
+
+export DEBIAN_FRONTEND=noninteractive
+
+echo "127.0.0.1 <%= @hostname_full %> <%= @hostname_short %>" | tee -a /etc/hosts
+echo "<%= @hostname_full %>" | tee /etc/hostname
+hostname <%= @hostname_full %>
+
+echo "deb http://apt.opscode.com/ `lsb_release -cs`-0.10 main" | tee /etc/apt/sources.list.d/opscode.list
+mkdir -p /etc/apt/trusted.gpg.d
+gpg --fetch-key http://apt.opscode.com/packages@opscode.com.gpg.key
+gpg --export packages@opscode.com | tee /etc/apt/trusted.gpg.d/opscode-keyring.gpg > /dev/null
+apt-get -y --force-yes update
+apt-get -y --force-yes -o Dpkg::Options::="--force-confnew" install opscode-keyring
+apt-get -y --force-yes update
+chown -R ${SUDO_USER}:${SUDO_USER} ${HOME}/.gnupg
+
+cat <<EOF | debconf-set-selections
+chef chef/chef_server_url string http://<%= @hostname_short %>:4000
+chef-solr chef-solr/amqp_password password <%= @amqp_password %>
+chef-server-webui chef-server-webui/admin_password password <%= @admin_password %>
+EOF
+
+CHEF_CLIENT_VERSION=`apt-cache showpkg chef | tee | grep -m 1 "<%= @chef_server_version %>" | cut -c -<%= @chef_server_version.length + 3 %>`
+CHEF_SERVER_VERSION=`apt-cache showpkg chef-server | tee | grep -m 1 "<%= @chef_server_version %>" | cut -c -<%= @chef_server_version.length + 3 %>`
+
+apt-get -y --force-yes install chef=$CHEF_CLIENT_VERSION chef-server=$CHEF_SERVER_VERSION
+
+echo -n "Waiting on validation.pem and webui.pem to appear..."
+until [ -f /etc/chef/validation.pem ] && [ -f /etc/chef/webui.pem ]; do
+  echo -n "."
+  sleep 1
+done
+echo "done."
+
+mkdir -p ~/.chef
+cp /etc/chef/validation.pem /etc/chef/webui.pem ~/.chef
+knife configure -i --server-url http://127.0.0.1:4000 -u ${SUDO_USER} -r '' --defaults --disable-editing --yes -VV
+knife client create <%= @user %> -a -f ${HOME}/.chef/<%= @user %>.pem --disable-editing --yes -VV
+chown -R ${SUDO_USER}:${SUDO_USER} ${HOME}
+
+if [ ! -f /etc/chef/client.pem ]; then
+  /etc/init.d/chef-client restart
+  echo -n "Waiting on client.pem to appear..."
+  i="0"
+  until [ -f /etc/chef/client.pem ]; do
+    i=$[$i+1]
+    sleep 1
+    echo -n "."
+    if [ $i -gt 60 ]; then
+      echo -n "restart-chef-client"
+      /etc/init.d/chef-client restart
+      i="0"
+    fi
+  done
+  echo "done."
+fi
+
+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
+
+touch ${CUCUMBER_CHEF_BOOTSTRAP_DONE}
+
+
+
+# #!/bin/env bash
+# #
+# # Cucumber-Chef Bootstrap Script
+# #
+# # Generated <%= Time.now.utc %>
+# #
+# set -x
+
+# CUCUMBER_CHEF_BOOTSTRAP_DONE="/.cucumber-chef-bootstrap-finished"
+# [ -f ${CUCUMBER_CHEF_BOOTSTRAP_DONE} ] && echo "Already bootstrapped!" && exit
+
+# export DEBIAN_FRONTEND=noninteractive
+
+# mkdir -p $HOME/.ssh/
+# cat <<EOF > $HOME/.ssh/config
+# UserKnownHostsFile /dev/null
+# StrictHostKeyChecking no
+# ForwardAgent yes
+# EOF
+
+# mkdir -p /root/.ssh/
+# cp -v $HOME/.ssh/config /root/.ssh/config
+
+# 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 rpm ruby1.9.3 # git-core #ruby-full rubygems git-core
+# #rpm ruby1.9.3 # ruby-libxml
+
+# wget http://www.opscode.com/chef/install.sh
+# bash install.sh -v <%= @chef_server_version %>
+# # rpm -Uvh --nodeps /tmp/*rpm
+# # export PATH=/opt/chef/embedded/bin/:$PATH
+
+# mkdir -p /etc/chef/
+# mkdir -p /var/log/chef/
+
+# cat <<EOF > /etc/chef/solo.rb
+# file_cache_path "/tmp/chef-solo/"
+# cookbook_path %w(/tmp/chef-solo/cookbooks/ /tmp/chef-solo/site-cookbooks/)
+# role_path "/tmp/chef-solo/roles/"
+# EOF
+
+# cat <<EOF > /etc/chef/bootstrap-chef-client.json
+# <%= @chef_client_attributes.to_json %>
+# EOF
+
+# cat <<EOF > /tmp/chef-solo/Gemfile
+# source 'https://rubygems.org'
+# gem 'chef', '<%= @chef_server_version %>'
+# gem 'berkshelf'
+# gem 'moneta', '< 0.7.0'
+# EOF
+
+# cat <<EOF > /tmp/chef-solo/Berksfile
+# site :opscode
+# cookbook 'chef-server'
+# EOF
+
+# cd /tmp/chef-solo/
+
+# gem install bundler --no-ri --no-rdoc
+# # bundle install --standalone --path vendor/bundle --binstubs
+# bundle install
+# # bin/librarian-chef install
+# # librarian-chef install
+# berks install --path /tmp/chef-solo/cookbooks/
+
+# # git clone git://github.com/opscode-cookbooks/chef-server.git /tmp/chef-solo/cookbooks/chef-server --branch
+
+# chef-solo --config /etc/chef/solo.rb --json-attributes /etc/chef/bootstrap-chef-solo.json --logfile /var/log/chef/chef-solo.log
+
+# echo -n "Waiting on validation.pem and webui.pem to appear..."
+# until [ -f /etc/chef/validation.pem ] && [ -f /etc/chef/webui.pem ]; do
+#   echo -n "."
+#   sleep 1
+# done
+# echo "done."
+
+# mkdir -p ~/.chef
+# cp /etc/chef/validation.pem /etc/chef/webui.pem ~/.chef
+
+# # apt-get -q -y install expect
+# # KNIFE_CONFIG_EXP_FILE="/tmp/knife-config.exp"
+# # cat <<EOF > ${KNIFE_CONFIG_EXP_FILE}
+# # #!/usr/bin/expect -f
+# # set timeout 10
+# # spawn knife configure -i
+# # expect "Overwrite ${HOME}/.chef/knife.rb" { send "Y\n" }
+# # expect "Where should I put the config file?" { send "\n" }
+# # expect "Please enter the chef server URL" { send "\n" }
+# # expect "Please enter a clientname for the new client" { send "${SUDO_USER}\n" }
+# # expect "Please enter the existing admin clientname" { send "\n" }
+# # expect "Please enter the location of the existing admin client" { send "${HOME}/.chef/webui.pem\n" }
+# # expect "Please enter the validation clientname" { send "\n" }
+# # expect "Please enter the location of the validation key" { send "${HOME}/.chef/validation.pem\n" }
+# # expect "Please enter the path to a chef repository" { send "${HOME}/chef_repo\n" }
+# # interact
+# # EOF
+# # chmod +x ${KNIFE_CONFIG_EXP_FILE}
+# # ${KNIFE_CONFIG_EXP_FILE}
+# # run("#{try_sudo} knife configure -i -n -y -s http://localhost:4000 -u root -r '' --defaults", :hosts => server)
+
+# knife configure -i --server-url http://127.0.0.1:4000 -u ${SUDO_USER} --defaults --disable-editing --yes -VV
+# knife client create <%= @user %> -a -f ${HOME}/.chef/<%= @user %>.pem --disable-editing --yes -VV
+# chown -Rv ${SUDO_USER}:${SUDO_USER} ${HOME}
+
+# # knife cookbook upload --all --cookbook-path /tmp/chef-solo/cookbooks:/tmp/chef-solo/site-cookbooks --force --yes -VV
+# # knife role from file /tmp/chef-solo/roles/*.rb --yes -VV
+# # chef-client -j /etc/chef/bootstrap-chef-client.json
+
+# touch ${CUCUMBER_CHEF_BOOTSTRAP_DONE}

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

@@ -0,0 +1,79 @@
+#!/bin/env bash
+#
+# Cucumber-Chef 'Chef >= 11.0.0' Bootstrap Script
+#
+# Generated <%= Time.now.utc %>
+#
+set -x
+
+CUCUMBER_CHEF_BOOTSTRAP_DONE="/.cucumber-chef-bootstrap-finished"
+# [ -f ${CUCUMBER_CHEF_BOOTSTRAP_DONE} ] && echo "Already bootstrapped!" && exit
+
+export DEBIAN_FRONTEND=noninteractive
+
+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
+
+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]" ]
+}
+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
+
+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
+  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
+
+mkdir -p ~/.chef
+cp /etc/chef-server/chef-validator.pem /etc/chef-server/chef-webui.pem ~/.chef
+
+apt-get -y --force-yes install expect
+KNIFE_CONFIG_EXP_FILE="/tmp/knife-config.exp"
+cat <<EOF > ${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" }
+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}

data/lib/cucumber/chef/test_lab.rb

@@ -73,7 +73,7 @@ module Cucumber
           @proxy_ssh[container] ||= ZTK::SSH.new({:ui => @ui, :timeout => Cucumber::Chef::Config.command_timeout}.merge(options))
 
           @proxy_ssh[container].config.proxy_host_name = self.ip
-          @proxy_ssh[container].config.proxy_port = self.port
+          @proxy_ssh[container].config.proxy_port = Cucumber::Chef.lab_ssh_port || self.port
           @proxy_ssh[container].config.proxy_user = Cucumber::Chef.lab_user
           @proxy_ssh[container].config.proxy_keys = Cucumber::Chef.lab_identity
 

data/lib/cucumber/chef/utility.rb

@@ -195,6 +195,10 @@ module Cucumber
         lab_identity
       end
 
+      def lab_ssh_port
+        Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:ssh][:lab_port]
+      end
+
       def lab_hostname_short
         Cucumber::Chef::Config.test_lab[:hostname]
       end

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "3.0.0.rc.2" unless const_defined?(:VERSION)
+    VERSION = "3.0.0.rc.3" unless const_defined?(:VERSION)
 
 ################################################################################
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.2
+  version: 3.0.0.rc.3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
@@ -230,25 +230,23 @@ files:
 - bin/cc-console
 - bin/cc-knife
 - bin/cucumber-chef
-- chef_repo/Cheffile
-- chef_repo/Gemfile
+- chef_repo/cookbooks/cucumber-chef/LICENSE
+- chef_repo/cookbooks/cucumber-chef/README.md
+- chef_repo/cookbooks/cucumber-chef/attributes/default.rb
+- chef_repo/cookbooks/cucumber-chef/metadata.rb
+- chef_repo/cookbooks/cucumber-chef/recipes/default.rb
+- chef_repo/cookbooks/cucumber-chef/recipes/lxc.rb
+- chef_repo/cookbooks/cucumber-chef/recipes/test_lab.rb
+- chef_repo/cookbooks/cucumber-chef/templates/default/db-168-192.erb
+- chef_repo/cookbooks/cucumber-chef/templates/default/db-test-lab.erb
+- chef_repo/cookbooks/cucumber-chef/templates/default/dhcpd-conf.erb
+- chef_repo/cookbooks/cucumber-chef/templates/default/lxc-initializer-config.erb
+- chef_repo/cookbooks/cucumber-chef/templates/default/lxc-install-chef.erb
+- chef_repo/cookbooks/cucumber-chef/templates/default/motd.erb
+- chef_repo/cookbooks/cucumber-chef/templates/default/named-conf-local.erb
+- chef_repo/cookbooks/cucumber-chef/templates/default/solrconfig.erb
+- chef_repo/cookbooks/cucumber-chef/templates/default/ssh-config.erb
 - chef_repo/roles/test_lab.rb
-- chef_repo/site-cookbooks/cucumber-chef/LICENSE
-- chef_repo/site-cookbooks/cucumber-chef/README.md
-- chef_repo/site-cookbooks/cucumber-chef/attributes/default.rb
-- chef_repo/site-cookbooks/cucumber-chef/metadata.rb
-- chef_repo/site-cookbooks/cucumber-chef/recipes/default.rb
-- chef_repo/site-cookbooks/cucumber-chef/recipes/lxc.rb
-- chef_repo/site-cookbooks/cucumber-chef/recipes/test_lab.rb
-- chef_repo/site-cookbooks/cucumber-chef/templates/default/db-168-192.erb
-- chef_repo/site-cookbooks/cucumber-chef/templates/default/db-test-lab.erb
-- chef_repo/site-cookbooks/cucumber-chef/templates/default/dhcpd-conf.erb
-- chef_repo/site-cookbooks/cucumber-chef/templates/default/lxc-initializer-config.erb
-- chef_repo/site-cookbooks/cucumber-chef/templates/default/lxc-install-chef.erb
-- chef_repo/site-cookbooks/cucumber-chef/templates/default/motd.erb
-- chef_repo/site-cookbooks/cucumber-chef/templates/default/named-conf-local.erb
-- chef_repo/site-cookbooks/cucumber-chef/templates/default/solrconfig.erb
-- chef_repo/site-cookbooks/cucumber-chef/templates/default/ssh-config.erb
 - cucumber-chef.gemspec
 - examples/README.md
 - features/installing.feature
@@ -279,7 +277,8 @@ files:
 - lib/cucumber/chef/steps/chef_steps.rb
 - lib/cucumber/chef/steps/minitest_steps.rb
 - lib/cucumber/chef/steps/ssh_steps.rb
-- lib/cucumber/chef/templates/bootstrap/ubuntu-precise-test-lab.erb
+- lib/cucumber/chef/templates/bootstrap/ubuntu-precise-apt.erb
+- lib/cucumber/chef/templates/bootstrap/ubuntu-precise-omnibus.erb
 - lib/cucumber/chef/templates/cucumber-chef/config-rb.erb
 - lib/cucumber/chef/templates/cucumber-chef/cucumber-yml.erb
 - lib/cucumber/chef/templates/cucumber/cc-hooks.rb
@@ -319,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Test Driven Infrastructure

data/chef_repo/Cheffile

@@ -1,4 +0,0 @@
-site 'http://community.opscode.com/api/v1'
-
-cookbook "chef-server"
-cookbook "chef-client"

data/chef_repo/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "librarian-chef"

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

@@ -1,80 +0,0 @@
-#!/bin/env bash
-#
-# Cucumber-Chef Bootstrap Script
-#
-# Generated <%= Time.now.utc %>
-#
-set -x
-
-CUCUMBER_CHEF_BOOTSTRAP_DONE="/.cucumber-chef-bootstrap-finished"
-[ -f ${CUCUMBER_CHEF_BOOTSTRAP_DONE} ] && echo "Already bootstrapped!" && exit
-
-export DEBIAN_FRONTEND=noninteractive
-
-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
-
-wget http://www.opscode.com/chef/install.sh
-bash install.sh -v <%= @chef_version %>
-rpm -Uvh --nodeps /tmp/*rpm
-export PATH=/opt/chef/embedded/bin/:$PATH
-
-mkdir -p /etc/chef/
-mkdir -p /var/log/chef/
-
-cat <<EOF > /etc/chef/solo.rb
-file_cache_path "/tmp/chef-solo/"
-cookbook_path %w(/tmp/chef-solo/cookbooks/ /tmp/chef-solo/site-cookbooks/)
-role_path "/tmp/chef-solo/roles/"
-EOF
-
-cat <<EOF > /etc/chef/bootstrap.json
-<%= @chef_client_attributes.to_json %>
-EOF
-
-cd /tmp/chef-solo/
-gem install bundler --no-ri --no-rdoc
-bundle install --standalone --path vendor/bundle --binstubs
-bin/librarian-chef install
-
-chef-solo --config /etc/chef/solo.rb --json-attributes /etc/chef/bootstrap.json --logfile /var/log/chef/chef-solo.log --log_level debug
-
-echo -n "Waiting on validation.pem and webui.pem to appear..."
-until [ -f /etc/chef/validation.pem ] && [ -f /etc/chef/webui.pem ]; do
-  echo -n "."
-  sleep 1
-done
-echo "done."
-
-mkdir -p ~/.chef
-cp /etc/chef/validation.pem /etc/chef/webui.pem ~/.chef
-
-apt-get -q -y install expect
-KNIFE_CONFIG_EXP_FILE="/tmp/knife-config.exp"
-cat <<EOF > ${KNIFE_CONFIG_EXP_FILE}
-#!/usr/bin/expect -f
-set timeout 10
-spawn knife configure -i
-expect "Overwrite ${HOME}/.chef/knife.rb" { send "Y\n" }
-expect "Where should I put the config file?" { send "\n" }
-expect "Please enter the chef server URL" { send "\n" }
-expect "Please enter a clientname for the new client" { send "${SUDO_USER}\n" }
-expect "Please enter the existing admin clientname" { send "\n" }
-expect "Please enter the location of the existing admin client" { send "${HOME}/.chef/webui.pem\n" }
-expect "Please enter the validation clientname" { send "\n" }
-expect "Please enter the location of the validation key" { send "${HOME}/.chef/validation.pem\n" }
-expect "Please enter the path to a chef repository" { send "${HOME}/chef_repo\n" }
-interact
-EOF
-chmod +x ${KNIFE_CONFIG_EXP_FILE}
-${KNIFE_CONFIG_EXP_FILE}
-
-knife client create <%= @user %> -d -a -f ${HOME}/.chef/<%= @user %>.pem
-
-chown -Rv ${SUDO_USER}:${SUDO_USER} ${HOME}
-
-touch ${CUCUMBER_CHEF_BOOTSTRAP_DONE}