testlab 0.6.12 → 0.6.14

data/lib/commands/container.rb

@@ -248,7 +248,7 @@ EOF
   c.long_desc <<-EOF
 Recycles a container.  The container is taken through a series of state changes to ensure it is pristine.
 
-The containers is cycled in this order:
+The container is cycled in this order:
 
 Teardown -> Down -> Destroy -> Create -> Up -> Setup
 EOF

data/lib/testlab/node/ssh.rb

@@ -11,7 +11,7 @@ class TestLab
             c.host_name = @provider.ip
             c.port      = @provider.port
             c.user      = @provider.user
-            c.keys      = @provider.identity
+            c.keys      = [@provider.identity].flatten.compact
           end
         end
         @ssh
@@ -33,7 +33,7 @@ class TestLab
 
             c.user            = (options[:user]   || container.primary_user.id)
             c.password        = (options[:passwd] || container.primary_user.password)
-            c.keys            = (options[:keys]   || [container.primary_user.identity, @provider.identity])
+            c.keys            = (options[:keys]   || [container.primary_user.identity, @provider.identity].flatten.compact)
           end
         end
         @container_ssh[name]

data/lib/testlab/providers/vagrant.rb

@@ -91,7 +91,7 @@ class TestLab
 
       # Inquire the state of the Vagrant-controlled VM
       def state
-        output = self.vagrant_cli("status").output.grep(/#{self.instance_id}/).first
+        output = self.vagrant_cli("status").output.split("\n").select{ |line| (line =~ /#{self.instance_id}/) }.first
         result = UNKNOWN_STATE
         ALL_STATES.map{ |s| s.to_s.gsub('_', ' ') }.each do |state|
           if output =~ /#{state}/

data/lib/testlab/provisioner.rb

@@ -7,16 +7,14 @@ class TestLab
   #
   # @author Zachary Patten <zachary AT jovelabs DOT com>
   class Provisioner
-    autoload :Apt,         'testlab/provisioners/apt'
-    autoload :AptCacherNG, 'testlab/provisioners/apt_cacher_ng'
-    autoload :Bind,        'testlab/provisioners/bind'
-    autoload :ChefGem,     'testlab/provisioners/chef_gem'
-    autoload :OmniBus,     'testlab/provisioners/omnibus'
-    autoload :OmniTruck,   'testlab/provisioners/omnitruck'
-    autoload :Raring,      'testlab/provisioners/raring'
-    autoload :Resolv,      'testlab/provisioners/resolv'
-    autoload :Route,       'testlab/provisioners/route'
-    autoload :Shell,       'testlab/provisioners/shell'
+    autoload :Apt,          'testlab/provisioners/apt'
+    autoload :AptCacherNG,  'testlab/provisioners/apt_cacher_ng'
+    autoload :Bind,         'testlab/provisioners/bind'
+    autoload :Chef,         'testlab/provisioners/chef'
+    autoload :Raring,       'testlab/provisioners/raring'
+    autoload :Resolv,       'testlab/provisioners/resolv'
+    autoload :Route,        'testlab/provisioners/route'
+    autoload :Shell,        'testlab/provisioners/shell'
 
     class << self
 

data/lib/testlab/provisioners/chef/omni_bus.rb

@@ -0,0 +1,104 @@
+class TestLab
+  class Provisioner
+    class Chef
+
+      # OmniBus Provisioner Error Class
+      class OmniBusError < ChefError; end
+
+      # OmniBus Provisioner Class
+      #
+      # @author Zachary Patten <zachary AT jovelabs DOT com>
+      class OmniBus
+
+        def initialize(config={}, ui=nil)
+          @config = (config || Hash.new)
+          @ui     = (ui || TestLab.ui)
+
+          @chef_server = TestLab::Container.first('chef-server')
+
+          @config[:chef] ||= Hash.new
+          @config[:chef][:client] ||= Hash.new
+          @config[:chef][:client][:version]    ||= %(latest)
+          @config[:chef][:client][:log_level]  ||= :info
+          @config[:chef][:client][:server_url] ||= "https://#{@chef_server.ip}"
+          @config[:chef][:client][:attributes] ||= Hash.new
+
+          @ui.logger.debug { "config(#{@config.inspect})" }
+        end
+
+        # OmniBus Provisioner Container Setup
+        #
+        # Renders the defined script to a temporary file on the target container
+        # and proceeds to execute said script as root via *lxc-attach*.
+        #
+        # @param [TestLab::Container] container The container which we want to
+        #   provision.
+        # @return [Boolean] True if successful.
+        def on_container_setup(container)
+          @config[:chef][:client][:node_name] ||= container.id
+
+          omnibus_template = File.join(TestLab::Provisioner::Chef.template_dir, 'omni_bus.erb')
+
+          config = {}.merge!({
+            :chef_client_cli => chef_client_cli(container),
+            :chef_client_rb => chef_client_rb(container),
+            :validation_pem => validation_pem,
+            :sudo_user => container.primary_user.id,
+            :sudo_uid => container.primary_user.uid,
+            :sudo_gid => container.primary_user.gid,
+            :home_dir => container.primary_user.home_dir
+          }).merge!(@config)
+
+          container.bootstrap(ZTK::Template.render(omnibus_template, config))
+
+          true
+        end
+
+        # OmniBus Provisioner Container Teardown
+        #
+        # @return [Boolean] True if successful.
+        def on_container_teardown(container)
+          if @chef_server.state == :running
+            @chef_server.ssh.exec(%(knife node delete #{container.id} --yes), :ignore_exit_status => true)
+            @chef_server.ssh.exec(%(knife client delete #{container.id} --yes), :ignore_exit_status => true)
+          end
+
+          true
+        end
+
+      private
+
+        def chef_client_cli(container, *args)
+          arguments = Array.new
+
+          arguments << %(chef-client)
+          arguments << [args]
+          arguments << %(--node-name #{container.id})
+          arguments << %(--environment #{@config[:chef][:client][:environment]}) if !@config[:chef][:client][:environment].nil?
+          arguments << %(--json-attributes /etc/chef/attributes.json)
+          arguments << %(--server #{@config[:chef][:client][:server_url]})
+          arguments << %(--once)
+
+          arguments.flatten.compact.join(' ')
+        end
+
+        def chef_client_rb(container)
+          <<-EOF
+#{ZTK::Template.do_not_edit_notice(:message => "Lookout TestLab Chef-Client Configuration")}
+log_level               #{@config[:chef][:client][:log_level].inspect}
+log_location            STDOUT
+chef_server_url         #{@config[:chef][:client][:server_url].inspect}
+validation_client_name  "chef-validator"
+node_name               #{@config[:chef][:client][:node_name].inspect}
+          EOF
+        end
+
+        def validation_pem
+          @chef_server.ssh.exec(%((cat ~/.chef/validation.pem || cat ~/.chef/chef-validator.pem) 2> /dev/null)).output.strip
+        end
+
+      end
+
+    end
+  end
+end

data/lib/testlab/provisioners/chef/omni_truck.rb

@@ -0,0 +1,90 @@
+class TestLab
+  class Provisioner
+    class Chef
+
+      # OmniTruck Provisioner Error Class
+      class OmniTruckError < ChefError; end
+
+      # OmniTruck Provisioner Class
+      #
+      # @author Zachary Patten <zachary AT jovelabs DOT com>
+      class OmniTruck
+        require 'json'
+
+        def initialize(config={}, ui=nil)
+          @config = (config || Hash.new)
+          @ui     = (ui || TestLab.ui)
+
+          @config[:chef] ||= Hash.new
+          @config[:chef][:server] ||= Hash.new
+          @config[:chef][:server][:version]     ||= %(latest)
+          @config[:chef][:server][:prereleases] ||= false
+          @config[:chef][:server][:nightlies]   ||= false
+          @config[:chef][:server][:server_url]  ||= "https://127.0.0.1"
+
+          @ui.logger.debug { "config(#{@config.inspect})" }
+        end
+
+        # OmniTruck Provisioner Container Setup
+        #
+        # Renders the defined script to a temporary file on the target container
+        # and proceeds to execute said script as root via *lxc-attach*.
+        #
+        # @param [TestLab::Container] container The container which we want to
+        #   provision.
+        # @return [Boolean] True if successful.
+        def on_container_setup(container)
+          omnitruck_template = File.join(TestLab::Provisioner::Chef.template_dir, 'omni_truck.erb')
+
+          config = {}.merge!({
+            :server_name => container.ip,
+            :chef_solo_attributes => build_omni_truck_attributes(container),
+            :chef_validator => '/etc/chef-server/chef-validator.pem',
+            :chef_webui => '/etc/chef-server/chef-webui.pem',
+            :chef_admin => '/etc/chef-server/admin.pem',
+            :local_user => ENV['USER'],
+            :default_password => "p@ssw01d",
+            :sudo_user => container.primary_user.id,
+            :sudo_uid => container.primary_user.uid,
+            :sudo_gid => container.primary_user.gid,
+            :home_dir => container.primary_user.home_dir
+          }).merge!(@config)
+
+          container.bootstrap(ZTK::Template.render(omnitruck_template, config))
+
+          true
+        end
+
+      private
+
+        def build_omni_truck_attributes(container)
+          {
+            "chef-server" => {
+              "api_fqdn" => container.ip,
+              "nginx" => {
+                "enable_non_ssl" => true,
+                "server_name" => container.ip,
+                "url" => @config[:chef][:server][:server_url]
+              },
+              "lb" => {
+                "fqdn" => container.ip
+              },
+              "bookshelf" => {
+                "vip" => container.ip
+              },
+              "chef_server_webui" => {
+                "enable" => true
+              },
+              "version" => @config[:chef][:server][:version],
+              "prereleases" => @config[:chef][:server][:prereleases],
+              "nightlies" => @config[:chef][:server][:nightlies]
+            },
+            "run_list" => %w(recipe[chef-server::default])
+          }
+        end
+
+      end
+
+    end
+  end
+end

data/lib/testlab/provisioners/chef/ruby_gem_client.rb

@@ -0,0 +1,105 @@
+class TestLab
+  class Provisioner
+    class Chef
+
+      # RubyGemClient Provisioner Error Class
+      class RubyGemClientError < ChefError; end
+
+      # RubyGemClient Provisioner Class
+      #
+      # @author Zachary Patten <zachary AT jovelabs DOT com>
+      class RubyGemClient
+        require 'json'
+
+        def initialize(config={}, ui=nil)
+          @config = (config || Hash.new)
+          @ui     = (ui || TestLab.ui)
+
+          @chef_server = TestLab::Container.first('chef-server')
+
+          @config[:chef] ||= Hash.new
+          @config[:chef][:client] ||= Hash.new
+          @config[:chef][:client][:version]    ||= %(10.24.0)
+          @config[:chef][:client][:log_level]  ||= :info
+          @config[:chef][:client][:server_url] ||= "https://#{@chef_server.ip}"
+          @config[:chef][:client][:attributes] ||= Hash.new
+
+          @ui.logger.debug { "config(#{@config.inspect})" }
+        end
+
+        # RubyGemClient Provisioner Container Setup
+        #
+        # Renders the defined script to a temporary file on the target container
+        # and proceeds to execute said script as root via *lxc-attach*.
+        #
+        # @param [TestLab::Container] container The container which we want to
+        #   provision.
+        # @return [Boolean] True if successful.
+        def on_container_setup(container)
+          @config[:chef][:client][:node_name] ||= container.id
+
+          rubygem_client_template = File.join(TestLab::Provisioner::Chef.template_dir, 'ruby_gem_client.erb')
+
+          config = {}.merge!({
+            :chef_client_cli => chef_client_cli(container),
+            :chef_client_rb => chef_client_rb(container),
+            :validation_pem => validation_pem,
+            :sudo_user => container.primary_user.id,
+            :sudo_uid => container.primary_user.uid,
+            :sudo_gid => container.primary_user.gid,
+            :home_dir => container.primary_user.home_dir
+          }).merge!(@config)
+
+          container.bootstrap(ZTK::Template.render(rubygem_client_template, config))
+
+          true
+        end
+
+        # RubyGemClient Provisioner Container Teardown
+        #
+        # @return [Boolean] True if successful.
+        def on_container_teardown(container)
+          if @chef_server.state == :running
+            @chef_server.ssh.exec(%(knife node delete #{container.id} --yes), :ignore_exit_status => true)
+            @chef_server.ssh.exec(%(knife client delete #{container.id} --yes), :ignore_exit_status => true)
+          end
+
+          true
+        end
+
+      private
+
+        def chef_client_cli(container, *args)
+          arguments = Array.new
+
+          arguments << %(chef-client)
+          arguments << [args]
+          arguments << %(--node-name #{container.id})
+          arguments << %(--environment #{@config[:chef][:client][:environment]}) if !@config[:chef][:client][:environment].nil?
+          arguments << %(--json-attributes /etc/chef/attributes.json)
+          arguments << %(--server #{@config[:chef][:client][:server_url]})
+          arguments << %(--once)
+
+          arguments.flatten.compact.join(' ')
+        end
+
+        def chef_client_rb(container)
+          <<-EOF
+#{ZTK::Template.do_not_edit_notice(:message => "TestLab Chef-Client Configuration")}
+log_level               #{@config[:chef][:client][:log_level].inspect}
+log_location            STDOUT
+chef_server_url         #{@config[:chef][:client][:server_url].inspect}
+validation_client_name  "chef-validator"
+node_name               #{@config[:chef][:client][:node_name].inspect}
+          EOF
+        end
+
+        def validation_pem
+          @chef_server.ssh.exec(%((cat ~/.chef/validation.pem || cat ~/.chef/chef-validator.pem) 2> /dev/null)).output.strip
+        end
+
+      end
+
+    end
+  end
+end

data/lib/testlab/provisioners/chef/ruby_gem_server.rb

@@ -0,0 +1,74 @@
+class TestLab
+  class Provisioner
+    class Chef
+
+      # RubyGemServer Provisioner Error Class
+      class RubyGemServerError < ChefError; end
+
+      # RubyGemServer Provisioner Class
+      #
+      # @author Zachary Patten <zachary AT jovelabs DOT com>
+      class RubyGemServer
+        require 'json'
+
+        def initialize(config={}, ui=nil)
+          @config = (config || Hash.new)
+          @ui     = (ui || TestLab.ui)
+
+          @config[:chef] ||= Hash.new
+          @config[:chef][:server] ||= Hash.new
+          @config[:chef][:server][:version]     ||= %(10.24.0)
+          @config[:chef][:server][:server_url]  ||= "https://127.0.0.1"
+
+          @ui.logger.debug { "config(#{@config.inspect})" }
+        end
+
+        # RubyGemServer Provisioner Container Setup
+        #
+        # Renders the defined script to a temporary file on the target container
+        # and proceeds to execute said script as root via *lxc-attach*.
+        #
+        # @param [TestLab::Container] container The container which we want to
+        #   provision.
+        # @return [Boolean] True if successful.
+        def on_container_setup(container)
+          rubygemserver_template = File.join(TestLab::Provisioner.template_dir, 'chef', 'ruby_gem_server.erb')
+
+          config = {}.merge!({
+            :server_name => container.ip,
+            :chef_solo_attributes => build_chef_solo_attributes(container),
+            :chef_validator => '/etc/chef/validation.pem',
+            :chef_webui => '/etc/chef/webui.pem',
+            :chef_admin => '/etc/chef/admin.pem',
+            :default_password => "p@ssw01d",
+            :local_user => ENV['USER'],
+            :sudo_user => container.primary_user.id,
+            :sudo_uid => container.primary_user.uid,
+            :sudo_gid => container.primary_user.gid,
+            :home_dir => container.primary_user.home_dir,
+            :chef_gems => %w(chef chef-solr chef-expander chef-server-api chef-server-webui),
+            :chef_services => %w(couchdb rabbitmq-server chef-solr chef-expander chef-server chef-server-webui apache2)
+          }).merge!(@config)
+
+          container.bootstrap(ZTK::Template.render(rubygemserver_template, config))
+
+          true
+        end
+
+      private
+
+        def build_chef_solo_attributes(container)
+          {
+            "chef_server" => {
+              "url" => @config[:chef][:server][:server_url],
+              "webui_enabled" => true
+            },
+            "run_list" => %w(recipe[chef-server::rubygems-install] recipe[chef-server::apache-proxy])
+          }
+        end
+
+      end
+
+    end
+  end
+end

data/lib/testlab/provisioners/chef.rb

@@ -0,0 +1,28 @@
+class TestLab
+  class Provisioner
+
+    # Chef Provisioner Error Class
+    class ChefError < ProvisionerError; end
+
+    # Chef Provisioner Class
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    class Chef
+
+      autoload :RubyGemClient,  'testlab/provisioners/chef/ruby_gem_client'
+      autoload :RubyGemServer,  'testlab/provisioners/chef/ruby_gem_server'
+      autoload :OmniBus,        'testlab/provisioners/chef/omni_bus'
+      autoload :OmniTruck,      'testlab/provisioners/chef/omni_truck'
+
+      class << self
+
+        # Returns the path to the gems provisioner templates
+        def template_dir
+          File.join(TestLab::Provisioner.template_dir, "chef")
+        end
+
+      end
+
+    end
+  end
+end

data/lib/testlab/provisioners/templates/chef/omni_bus.erb

@@ -0,0 +1,36 @@
+#!/bin/env bash
+<%= ZTK::Template.do_not_edit_notice(:message => "Chef OmniBus Bootstrap") %>
+set -x
+set -e
+
+export DEBIAN_FRONTEND="noninteractive"
+export SUDO_USER="<%= @sudo_user %>"
+export SUDO_UID="<%= @sudo_uid %>"
+export SUDO_GID="<%= @sudo_gid %>"
+export HOME="<%= @home_dir %>"
+
+export
+
+cd /tmp
+apt-get -y install wget ca-certificates || yum -y install wget ca-certificates
+rm -fv /tmp/install.sh
+wget -v https://www.opscode.com/chef/install.sh -O /tmp/install.sh
+/bin/bash /tmp/install.sh -v <%= @chef[:client][:version] %>
+
+mkdir -pv /etc/chef/
+
+cat <<EOF | tee /etc/chef/attributes.json
+<%= @chef[:client][:attributes].to_json %>
+EOF
+
+cat <<EOF | tee /etc/chef/validation.pem
+<%= @validation_pem %>
+EOF
+
+cat <<EOF | tee /etc/chef/client.rb
+<%= @chef_client_rb %>
+EOF
+
+<%= @chef_client_cli %>
+
+touch /.omni-bus-bootstrap

data/lib/testlab/provisioners/templates/chef/omni_truck.erb

@@ -0,0 +1,81 @@
+#!/bin/env bash
+<%= ZTK::Template.do_not_edit_notice(:message => "Chef OmniTruck Bootstrap") %>
+set -x
+set -e
+
+export DEBIAN_FRONTEND="noninteractive"
+export CHEF_SOLO_ROOT="/tmp/chef-solo"
+export SUDO_USER="<%= @sudo_user %>"
+export SUDO_UID="<%= @sudo_uid %>"
+export SUDO_GID="<%= @sudo_gid %>"
+export HOME="<%= @home_dir %>"
+export KNIFE_CONFIG_EXP_FILE="/tmp/knife.exp"
+export
+
+mkdir -p ${CHEF_SOLO_ROOT}
+cd ${CHEF_SOLO_ROOT}
+
+apt-get -y --force-yes update
+apt-get -y --force-yes install build-essential expect wget curl libgecode-dev ca-certificates
+
+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/)
+role_path "${CHEF_SOLO_ROOT}/roles/"
+EOF
+
+cat <<EOF | tee ${CHEF_SOLO_ROOT}/attributes.json
+<%= @chef_solo_attributes.to_json %>
+EOF
+
+rm -fv ${CHEF_SOLO_ROOT}/install.sh
+wget -v https://www.opscode.com/chef/install.sh -O ${CHEF_SOLO_ROOT}/install.sh
+bash ${CHEF_SOLO_ROOT}/install.sh -v <%= @chef[:server][:version] %>
+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
+
+set +e
+chef-solo --config /etc/chef/solo.rb --json-attributes ${CHEF_SOLO_ROOT}/attributes.json --logfile /var/log/chef/chef-solo.log --log_level debug
+set -e
+
+cat << EOF | tee /etc/chef-server/chef-server.rb
+<%= ZTK::Template.do_not_edit_notice(:message => "OmniTruck Bootstrap") %>
+server_name = "<%= @server_name %>"
+#
+topology                "standalone"
+api_fqdn                server_name
+nginx['url']          = "https://#{server_name}"
+nginx['server_name']  = server_name
+lb['fqdn']            = server_name
+bookshelf['vip']      = server_name
+EOF
+chef-server-ctl reconfigure
+
+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."
+
+cp -v <%= @chef_validator %> <%= @chef_webui %> ~/.chef
+[ -f /etc/chef/validation.pem ] || ln -sv <%= @chef_validator %> /etc/chef/validation.pem
+[ -f /etc/chef/admin.pem ] || ln -sv <%= @chef_admin %> /etc/chef/admin.pem
+
+cat << EOF | tee ${KNIFE_CONFIG_EXP_FILE}
+#!/usr/bin/expect -f
+set timeout 10
+spawn knife configure --initial --server-url <%= @chef[:server][:server_url] %> --admin-client-key <%= @chef_admin %> --user <%= @sudo_user %> --repository '' --defaults --yes -VV
+expect "Please enter a password for the new user:" { send "<%= @default_password %>\n" }
+interact
+EOF
+chmod -v +x ${KNIFE_CONFIG_EXP_FILE}
+[ -f <%= @home_dir %>/.chef/<%= @sudo_user %>.pem ] || ${KNIFE_CONFIG_EXP_FILE}
+
+[ -f <%= @home_dir %>/.chef/<%= @local_user %>.pem ] || knife client create <%= @local_user %> --server-url <%= @chef[:server][:server_url] %> --user <%= @sudo_user %> --key <%= @home_dir %>/.chef/<%= @sudo_user %>.pem --admin --file <%= @home_dir %>/.chef/<%= @local_user %>.pem --editor echo --disable-editing --defaults --yes -VV
+
+chown -Rv ${SUDO_USER}:${SUDO_USER} ${HOME}
+
+touch /.omni-truck-bootstrap

data/lib/testlab/provisioners/templates/chef/ruby_gem_client.erb

@@ -0,0 +1,46 @@
+#!/bin/env bash
+<%= ZTK::Template.do_not_edit_notice(:message => "Chef OmniBus Bootstrap") %>
+set -x
+set -e
+
+export DEBIAN_FRONTEND="noninteractive"
+export SUDO_USER="<%= @sudo_user %>"
+export SUDO_UID="<%= @sudo_uid %>"
+export SUDO_GID="<%= @sudo_gid %>"
+export HOME="<%= @home_dir %>"
+
+export
+
+cd /tmp
+
+apt-get -y --force-yes update
+apt-get -y --force-yes install ca-certificates ruby1.8 rubygems
+
+mkdir -pv /etc/chef/
+
+cat <<EOF | tee /tmp/Gemfile
+source 'https://rubygems.org'
+gem 'chef', '<%= @chef[:client][:version] %>'
+gem 'moneta', '< 0.7.0'
+EOF
+
+gem install bundler --no-ri --no-rdoc
+bundle install
+
+update-alternatives --install /usr/bin/chef-client chef-client /usr/local/bin/chef-client 500
+
+cat <<EOF | tee /etc/chef/attributes.json
+<%= @chef[:client][:attributes].to_json %>
+EOF
+
+cat <<EOF | tee /etc/chef/validation.pem
+<%= @validation_pem %>
+EOF
+
+cat <<EOF | tee /etc/chef/client.rb
+<%= @chef_client_rb %>
+EOF
+
+<%= @chef_client_cli %>
+
+touch /.ruby-gem-client-bootstrap

data/lib/testlab/provisioners/templates/chef/ruby_gem_server.erb

@@ -0,0 +1,79 @@
+#!/bin/env bash
+<%= ZTK::Template.do_not_edit_notice(:message => "Chef RubyGem Bootstrap") %>
+set -x
+set -e
+
+export DEBIAN_FRONTEND="noninteractive"
+export CHEF_SOLO_ROOT="/tmp/chef-solo"
+export SUDO_USER="<%= @sudo_user %>"
+export SUDO_UID="<%= @sudo_uid %>"
+export SUDO_GID="<%= @sudo_gid %>"
+export HOME="<%= @home_dir %>"
+export
+
+mkdir -pv ${CHEF_SOLO_ROOT}
+cd ${CHEF_SOLO_ROOT}
+
+apt-get -y --force-yes update
+apt-get -y --force-yes install build-essential expect wget curl libgecode-dev ca-certificates ruby1.8 rubygems
+
+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/)
+role_path "${CHEF_SOLO_ROOT}/roles/"
+EOF
+
+cat <<EOF | tee ${CHEF_SOLO_ROOT}/attributes.json
+<%= @chef_solo_attributes.to_json %>
+EOF
+
+cat <<EOF | tee ${CHEF_SOLO_ROOT}/Gemfile
+source 'https://rubygems.org'
+<% @chef_gems.each do |chef_gem| -%>
+gem '<%= chef_gem %>', '<%= @chef[:server][:version] %>'
+<% end -%>
+gem 'haml', '< 4.0.0'
+gem 'moneta', '< 0.7.0'
+gem 'librarian-chef'
+EOF
+
+gem install bundler --no-ri --no-rdoc
+bundle install
+
+update-alternatives --install /usr/bin/chef-client chef-client /usr/local/bin/chef-client 500
+update-alternatives --install /usr/bin/chef-server chef-server /usr/local/bin/chef-server 500
+update-alternatives --install /usr/bin/chef-server-webui chef-server-webui /usr/local/bin/chef-server-webui 500
+update-alternatives --install /usr/bin/chef-expander chef-expander /usr/local/bin/chef-expander 500
+update-alternatives --install /usr/bin/chef-expanderctl chef-expanderctl /usr/local/bin/chef-expanderctl 500
+update-alternatives --install /usr/bin/chef-expander-vnode chef-expander-vnode /usr/local/bin/chef-expander-vnode 500
+update-alternatives --install /usr/bin/chef-solr chef-solr /usr/local/bin/chef-solr 500
+update-alternatives --install /usr/bin/chef-solr-installer chef-solr-installer /usr/local/bin/chef-solr-installer 500
+update-alternatives --install /usr/bin/chef-solo chef-solo /usr/local/bin/chef-solo 500
+update-alternatives --install /usr/bin/knife knife /usr/local/bin/knife 500
+
+cat <<EOF | tee ${CHEF_SOLO_ROOT}/Cheffile
+site 'http://community.opscode.com/api/v1'
+cookbook 'chef-server', '< 2.0.0'
+cookbook 'apt', '< 2.0.0'
+EOF
+librarian-chef install
+
+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."
+
+cp -v <%= @chef_validator %> <%= @chef_webui %> ~/.chef
+
+[ -f <%= @home_dir %>/.chef/<%= @sudo_user %>.pem ] || knife configure --initial --server-url <%= @chef[:server][:server_url] %> --user <%= @sudo_user %> --repository '' --defaults --yes -VV
+[ -f <%= @home_dir %>/.chef/<%= @local_user %>.pem ] || knife client create <%= @local_user %> --server-url <%= @chef[:server][:server_url] %> --user <%= @sudo_user %> --key <%= @home_dir %>/.chef/<%= @sudo_user %>.pem --admin --file <%= @home_dir %>/.chef/<%= @local_user %>.pem --editor echo --disable-editing --defaults --yes -VV
+
+chown -Rv ${SUDO_USER}:${SUDO_USER} ${HOME}
+
+touch /.ruby-gem-server-bootstrap

data/lib/testlab/user.rb

@@ -16,7 +16,6 @@ class TestLab
     # Associations and Attributes
     belongs_to  :container,  :class_name => 'TestLab::Container'
 
-    attribute   :user
     attribute   :password
 
     attribute   :identity

data/lib/testlab/version.rb

@@ -1,6 +1,6 @@
 class TestLab
   unless const_defined?(:VERSION)
     # TestLab Gem Version
-    VERSION = "0.6.12"
+    VERSION = "0.6.14"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -249,9 +249,11 @@ files:
 - lib/testlab/provisioners/apt.rb
 - lib/testlab/provisioners/apt_cacher_ng.rb
 - lib/testlab/provisioners/bind.rb
-- lib/testlab/provisioners/chef_gem.rb
-- lib/testlab/provisioners/omnibus.rb
-- lib/testlab/provisioners/omnitruck.rb
+- lib/testlab/provisioners/chef.rb
+- lib/testlab/provisioners/chef/omni_bus.rb
+- lib/testlab/provisioners/chef/omni_truck.rb
+- lib/testlab/provisioners/chef/ruby_gem_client.rb
+- lib/testlab/provisioners/chef/ruby_gem_server.rb
 - lib/testlab/provisioners/raring.rb
 - lib/testlab/provisioners/resolv.rb
 - lib/testlab/provisioners/route.rb
@@ -262,9 +264,10 @@ files:
 - lib/testlab/provisioners/templates/bind/bind-db.erb
 - lib/testlab/provisioners/templates/bind/bind-zone.erb
 - lib/testlab/provisioners/templates/bind/bind.erb
-- lib/testlab/provisioners/templates/chef/omnibus.erb
-- lib/testlab/provisioners/templates/chef/omnitruck.erb
-- lib/testlab/provisioners/templates/chef/rubygem.erb
+- lib/testlab/provisioners/templates/chef/omni_bus.erb
+- lib/testlab/provisioners/templates/chef/omni_truck.erb
+- lib/testlab/provisioners/templates/chef/ruby_gem_client.erb
+- lib/testlab/provisioners/templates/chef/ruby_gem_server.erb
 - lib/testlab/provisioners/templates/raring/bootstrap.erb
 - lib/testlab/provisioners/templates/resolv/resolv.conf.erb
 - lib/testlab/user.rb
@@ -298,18 +301,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3900495778607553131
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3900495778607553131
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/testlab/provisioners/chef_gem.rb

@@ -1,49 +0,0 @@
-class TestLab
-
-  class Provisioner
-
-    # ChefGem Provisioner Error Class
-    class ChefGemError < ProvisionerError; end
-
-    # ChefGem Provisioner Class
-    #
-    # @author Zachary Patten <zachary AT jovelabs DOT com>
-    class ChefGem
-      require 'json'
-
-      def initialize(config={}, ui=nil)
-        @config = (config || Hash.new)
-        @ui     = (ui || TestLab.ui)
-
-        @ui.logger.debug { "config(#{@config.inspect})" }
-      end
-
-      # ChefGem Provisioner Container Setup
-      #
-      # Renders the defined script to a temporary file on the target container
-      # and proceeds to execute said script as root via *lxc-attach*.
-      #
-      # @param [TestLab::Container] container The container which we want to
-      #   provision.
-      # @return [Boolean] True if successful.
-      def on_container_setup(container)
-        # NOOP
-
-        true
-      end
-
-      # ChefGem Provisioner Container Teardown
-      #
-      # This is a NO-OP currently.
-      #
-      # @return [Boolean] True if successful.
-      def on_container_teardown(container)
-        # NOOP
-
-        true
-      end
-
-    end
-
-  end
-end

data/lib/testlab/provisioners/omnibus.rb

@@ -1,50 +0,0 @@
-class TestLab
-
-  class Provisioner
-
-    # OmniBus Provisioner Error Class
-    class OmniBusError < ProvisionerError; end
-
-    # OmniBus Provisioner Class
-    #
-    # @author Zachary Patten <zachary AT jovelabs DOT com>
-    class OmniBus
-
-      def initialize(config={}, ui=nil)
-        @config = (config || Hash.new)
-        @ui     = (ui || TestLab.ui)
-
-        @config[:version]     ||= %(latest)
-        @config[:omnibus_url] ||= %(https://www.opscode.com/chef/install.sh)
-
-        @ui.logger.debug { "config(#{@config.inspect})" }
-      end
-
-      # OmniBus Provisioner Container Setup
-      #
-      # Renders the defined script to a temporary file on the target container
-      # and proceeds to execute said script as root via *lxc-attach*.
-      #
-      # @param [TestLab::Container] container The container which we want to
-      #   provision.
-      # @return [Boolean] True if successful.
-      def on_container_setup(container)
-        omnibus_template = File.join(TestLab::Provisioner.template_dir, 'chef', 'omnibus.erb')
-        container.bootstrap(ZTK::Template.render(omnibus_template, @config))
-      end
-
-      # OmniBus Provisioner Container Teardown
-      #
-      # This is a NO-OP currently.
-      #
-      # @return [Boolean] True if successful.
-      def on_container_teardown(container)
-        # NOOP
-
-        true
-      end
-
-    end
-
-  end
-end

data/lib/testlab/provisioners/omnitruck.rb

@@ -1,127 +0,0 @@
-class TestLab
-
-  class Provisioner
-
-    # OmniTruck Provisioner Error Class
-    class OmniTruckError < ProvisionerError; end
-
-    # OmniTruck Provisioner Class
-    #
-    # @author Zachary Patten <zachary AT jovelabs DOT com>
-    class OmniTruck
-      require 'json'
-
-      def initialize(config={}, ui=nil)
-        @config = (config || Hash.new)
-        @ui     = (ui || TestLab.ui)
-
-        @config[:version]     ||= "latest"
-        @config[:prereleases] ||= false
-        @config[:nightlies]   ||= false
-
-        @ui.logger.debug { "config(#{@config.inspect})" }
-      end
-
-      # OmniTruck Provisioner Container Setup
-      #
-      # Renders the defined script to a temporary file on the target container
-      # and proceeds to execute said script as root via *lxc-attach*.
-      #
-      # @param [TestLab::Container] container The container which we want to
-      #   provision.
-      # @return [Boolean] True if successful.
-      def on_container_setup(container)
-        omnibus_template = File.join(TestLab::Provisioner.template_dir, 'chef', 'omnitruck.erb')
-        config = {}.merge!({
-          :server_name => container.fqdn,
-          :chef_pre_11 => chef_pre_11?,
-          :chef_solo_attributes => build_chef_solo_attributes(container),
-          :chef_validator => (chef_pre_11? ? '/etc/chef/validation.pem' : '/etc/chef-server/chef-validator.pem'),
-          :chef_webui => (chef_pre_11? ? '/etc/chef/webui.pem' : '/etc/chef-server/chef-webui.pem'),
-          :chef_admin => (chef_pre_11? ? '/etc/chef/admin.pem' : '/etc/chef-server/admin.pem'),
-          :default_password => "p@ssw01d",
-          :user => ENV['USER'],
-          :hostname_short => container.id,
-          :hostname_full => container.fqdn,
-          :omnibus_version => omnibus_version
-        }).merge!(@config)
-        container.bootstrap(ZTK::Template.render(omnibus_template, config))
-      end
-
-      # OmniTruck Provisioner Container Teardown
-      #
-      # This is a NO-OP currently.
-      #
-      # @return [Boolean] True if successful.
-      def on_container_teardown(container)
-        # NOOP
-
-        true
-      end
-
-    private
-
-      def build_chef_solo_10_attributes(container)
-        {
-          "chef_server" => {
-            "url" => "https://#{container.fqdn}",
-            "webui_enabled" => true
-          },
-          "run_list" => %w(recipe[chef-server::rubygems-install] recipe[chef-server::apache-proxy])
-        }
-      end
-
-      def build_chef_solo_11_attributes(container)
-        {
-          "chef-server" => {
-            "api_fqdn" => container.fqdn,
-            "nginx" => {
-              "enable_non_ssl" => true,
-              "server_name" => container.fqdn,
-              "url" => "https://#{container.fqdn}"
-            },
-            "lb" => {
-              "fqdn" => container.fqdn
-            },
-            "bookshelf" => {
-              "vip" => container.fqdn
-            },
-            "chef_server_webui" => {
-              "enable" => true
-            },
-            "version" => @config[:version],
-            "prereleases" => @config[:prereleases],
-            "nightlies" => @config[:nightlies]
-          },
-          "run_list" => %w(recipe[chef-server::default])
-        }
-      end
-
-      def build_chef_solo_attributes(container)
-        if chef_pre_11?
-          build_chef_solo_10_attributes(container)
-        else
-          build_chef_solo_11_attributes(container)
-        end
-      end
-
-      def chef_pre_11?
-        if (@config[:version].to_s.downcase != "latest") && (@config[:version].to_f < 11.0)
-          true
-        else
-          false
-        end
-      end
-
-      def omnibus_version
-        if (@config[:version].to_f == 0.1)
-          "10.12.0"
-        else
-          @config[:version]
-        end
-      end
-
-    end
-
-  end
-end

data/lib/testlab/provisioners/templates/chef/omnibus.erb

@@ -1,8 +0,0 @@
-set -x
-
-export DEBIAN_FRONTEND="noninteractive"
-cd /tmp
-apt-get -y install wget || yum -y install wget
-rm -fv /tmp/install.sh
-wget -v --no-check-certificate <%= @omnibus_url %> -O /tmp/install.sh
-/bin/bash /tmp/install.sh -v <%= @version %>

data/lib/testlab/provisioners/templates/chef/omnitruck.erb

@@ -1,101 +0,0 @@
-#!/bin/env bash
-<%= ZTK::Template.do_not_edit_notice(:message => "OmniTruck Bootstrap") %>
-set -x
-
-export DEBIAN_FRONTEND="noninteractive"
-CHEF_SOLO_ROOT="/tmp/chef-solo"
-KNIFE_CONFIG_EXP_FILE="/tmp/knife-config.exp"
-export DEBIAN_FRONTEND CHEF_SOLO_ROOT KNIFE_CONFIG_EXP_FILE
-
-mkdir -p ${CHEF_SOLO_ROOT}
-cd ${CHEF_SOLO_ROOT}
-
-apt-get -y --force-yes update
-apt-get -y --force-yes install build-essential expect wget curl libgecode-dev
-
-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 https://www.opscode.com/chef/install.sh
-bash install.sh -v <%= @omnibus_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 -%>
-
-export PATH=/opt/chef/embedded/bin:$PATH
-
-cat <<EOF | tee ${CHEF_SOLO_ROOT}/Gemfile
-source 'https://rubygems.org'
-gem 'chef', '<%= @version %>'
-gem 'berkshelf'
-gem 'moneta', '< 0.7.0'
-EOF
-
-cat <<EOF | tee ${CHEF_SOLO_ROOT}/Berksfile
-site :opscode
-cookbook 'chef-server'
-EOF
-
-gem install bundler --no-ri --no-rdoc
-bundle install --standalone --path vendor/bundle --binstubs
-bin/berks install --path ${CHEF_SOLO_ROOT}/cookbooks/
-<% end -%>
-
-PATH=./bin/:$PATH chef-solo --config /etc/chef/solo.rb --json-attributes ${CHEF_SOLO_ROOT}/attributes.json --logfile /var/log/chef/chef-solo.log --log_level debug
-<% if (@chef_pre_11 == false) -%>
-
-cat << EOF | tee /etc/chef-server/chef-server.rb
-<%= ZTK::Template.do_not_edit_notice(:message => "OmniTruck Bootstrap") %>
-server_name = "<%= @server_name %>"
-#
-topology                "standalone"
-api_fqdn                server_name
-nginx['url']          = "https://#{server_name}"
-nginx['server_name']  = server_name
-lb['fqdn']            = server_name
-bookshelf['vip']      = server_name
-EOF
-sudo chef-server-ctl reconfigure
-<% end -%>
-
-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."
-
-cp -v <%= @chef_validator %> <%= @chef_webui %> ~/.chef
-<% if (@chef_pre_11 == false) -%>
-
-ln -sv <%= @chef_validator %> /etc/chef/validation.pem
-ln -sv <%= @chef_admin %> /etc/chef/admin.pem
-<% end -%>
-
-cat <<EOF | tee ${KNIFE_CONFIG_EXP_FILE}
-#!/usr/bin/expect -f
-set timeout 10
-<% 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 -Rv ${SUDO_USER}:${SUDO_USER} ${HOME}