cucumber-chef 3.0.0.rc.5 → 3.0.0

data/WIKI.md

@@ -314,6 +314,83 @@ Displays information on the status of the current test lab containers:
     | mysql-test-1         | true  | ubuntu | 192.168.0.220 | 00:00:5e:ea:fe:28 | Chef: 10.18.2 | true    |
     +----------------------+-------+--------+---------------+-------------------+---------------+---------+
 
+## `cucumber-chef displayconfig`
+
+Display various configuration information:
+
+    $ cucumber-chef displayconfig
+    cucumber-chef v3.0.0.rc.5
+    --------------------------------------------------------------------------------
+    ---
+    :mode: :user
+    :prerelease: true
+    :user: zpatten
+    :artifacts:
+      chef-client-log: /var/log/chef/client.log
+      chef-client-stacktrace: /var/chef/cache/chef-stacktrace.out
+    :chef:
+      :version: 10.24.0
+      :default_password: p@ssw0rd1
+      :render_client_rb: true
+      :cookbook_paths:
+      - cookbooks
+      - site-cookbooks
+    :test_lab:
+      :hostname: cucumber-chef
+      :tld: test-lab
+    :command_timeout: 1800
+    :provider: :vagrant
+    :aws:
+      :bootstrap_user: ubuntu
+      :lab_user: cucumber-chef
+      :lxc_user: root
+      :ssh:
+        :lab_port: 22
+        :lxc_port: 22
+      :ubuntu_release: precise
+      :aws_instance_arch: i386
+      :aws_instance_disk_store: ebs
+      :aws_instance_type: c1.medium
+      :aws_security_group: cucumber-chef
+      :identity_file:
+      :aws_access_key_id:
+      :aws_secret_access_key:
+      :aws_ssh_key_id:
+      :region: us-west-2
+      :availability_zone: us-west-2a
+    :vagrant:
+      :bootstrap_user: vagrant
+      :lab_user: cucumber-chef
+      :lxc_user: root
+      :ssh:
+        :lab_ip: 192.168.33.10
+        :lab_port: 22
+        :lxc_port: 22
+      :cpus: 4
+      :memory: 4096
+      :identity_file: /home/zpatten/.vagrant.d/insecure_private_key
+
+    --------------------------------------------------------------------------------
+                   root_dir = "/home/zpatten/code/cc-chef-repo/vendor/checkouts/cucumber-chef"
+                   home_dir = "/home/zpatten/code/cc-chef-repo/.cucumber-chef"
+                   log_file = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/cucumber-chef.log"
+              artifacts_dir = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/vagrant/artifacts"
+                  config_rb = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/config.rb"
+                    labfile = "/home/zpatten/code/cc-chef-repo/Labfile"
+                  chef_repo = "/home/zpatten/code/cc-chef-repo"
+                  chef_user = "zpatten"
+              chef_identity = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/vagrant/zpatten.pem"
+             bootstrap_user = "vagrant"
+    bootstrap_user_home_dir = "/home/vagrant"
+         bootstrap_identity = "/home/zpatten/.vagrant.d/insecure_private_key"
+                   lab_user = "cucumber-chef"
+          lab_user_home_dir = "/home/cucumber-chef"
+               lab_identity = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/vagrant/id_rsa-cucumber-chef"
+                   lxc_user = "root"
+          lxc_user_home_dir = "/root"
+               lxc_identity = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/vagrant/id_rsa-root"
+                chef_pre_11 = true
+    --------------------------------------------------------------------------------
 
 # RESOURCES
 

data/bin/cucumber-chef

@@ -18,8 +18,6 @@ class CucumberChef < Thor
 
       CucumberChef.source_root(source_dir)
 
-      get_aws_credentials
-
       templates = {
         "config-rb.erb" => "config.rb"
       }
@@ -70,51 +68,6 @@ class CucumberChef < Thor
       exit(255)
     end
 
-    def get_aws_credentials
-      say "OHAI!", :magenta
-      puts
-      say "Cucumber-Chef uses Amazon Web Services to build a test lab for automated infrastructure testing."
-      say "I need a few details before I can set up your test lab for you."
-      puts
-      say "We're going to use symmetric keys to authenticate with the AWS API."
-      say "First, I need your access key."
-      say "Your access key identifies you as you make API calls.  It's not a secret."
-      say "You can find it under 'Access Credentials', on https://aws-portal.amazon.com/gp/aws/securityCredentials"
-      puts
-      @aws_access_key = ask "What is your AWS Access Key?", :bold
-      puts
-      say "Now I need your secret access key.  This *is* a secret.  The clue's in the name."
-      say "This is just a string of characters used to create the digital signature included in your API requests."
-      say "You can also find this under 'Access Credentials', on https://aws-portal.amazon.com/gp/aws/securityCredentials"
-      puts
-      @aws_secret_access_key = ask "What is your AWS Secret Access Key?", :bold
-      puts
-      say "Right. Now I need to know about the ssh key pair you want to use to connect to EC2 machines."
-      say "I need the name of the key pair. You can see this on the AWS management console, under Network & Security > Key Pairs"
-      puts
-      @aws_ssh_id = ask "What is your AWS Key Pair called?", :bold
-      puts
-      say "I also need to know what the ssh key is called - the actual name of the file on your local machine, eg #{@aws_ssh_id}.pem"
-      puts
-      @aws_ssh_key = ask "What's the filename of your ssh key?", :bold
-      puts
-      say "And, finally, I need to know where you keep it, on the file system. Often this is ~/.ssh"
-      puts
-      @aws_ssh_key_dir = ask "What directory contains your ssh key?", :bold
-      puts
-      say "OK, nearly there. AWS uses different keys depending on which region you use."
-      say "For example, 'us-east', 'us-west', or 'eu-west'"
-      puts
-      @region = ask "Which region are you using?", :bold
-      puts
-      say("One last thing.  If you're using librarian-chef, we want to be sure all the hooks are in place.")
-      puts
-      @librarian_chef = yes?("Does this chef-repo use librarian-chef?", :bold)
-      puts
-      say "Awesome.  Thank you!"
-      puts
-    end
-
   end
 
 ################################################################################
@@ -513,9 +466,11 @@ class CucumberChef < Thor
       "config_rb" => Cucumber::Chef.config_rb,
       "labfile" => Cucumber::Chef.labfile,
       "chef_repo" => Cucumber::Chef.chef_repo,
-      "bootstrap_identity" => Cucumber::Chef.bootstrap_identity,
       "chef_user" => Cucumber::Chef.chef_user,
       "chef_identity" => Cucumber::Chef.chef_identity,
+      "bootstrap_user" => Cucumber::Chef.bootstrap_user,
+      "bootstrap_user_home_dir" => Cucumber::Chef.bootstrap_user_home_dir,
+      "bootstrap_identity" => Cucumber::Chef.bootstrap_identity,
       "lab_user" => Cucumber::Chef.lab_user,
       "lab_user_home_dir" => Cucumber::Chef.lab_user_home_dir,
       "lab_identity" => Cucumber::Chef.lab_identity,

data/chef_repo/cookbooks/cucumber-chef/recipes/test_lab.rb

@@ -27,48 +27,64 @@
   package p
 end
 
-[ node.cucumber_chef.lab_user, node.cucumber_chef.lxc_user ].flatten.each do |user|
-  home_dir = (user == "root" ? "/#{user}" : "/home/#{user}")
+[ node.cucumber_chef.lab_user, node.cucumber_chef.lxc_user ].each do |username|
+  home_dir = ((username.downcase == "root") ? "/#{username}" : "/home/#{username}")
+
+  user username do
+    comment username
+    home home_dir
+    shell "/bin/bash"
+    supports :manage_home => true
+  end
+
+  directory "create home directory for #{username}" do
+    path home_dir
+    owner username
+    group username
+    mode "0700"
 
-  directory "create .ssh directory for #{user}" do
+    not_if { File.directory?(File.join(home_dir)) }
+  end
+
+  directory "create .ssh directory for #{username}" do
     path "#{home_dir}/.ssh"
-    owner user
-    group user
+    owner username
+    group username
     mode "0700"
 
     not_if { File.directory?(File.join(home_dir, ".ssh")) }
   end
 
-  template "create ssh config for #{user}" do
+  template "create ssh config for #{username}" do
     path "#{home_dir}/.ssh/config"
     source "ssh-config.erb"
-    owner user
-    group user
+    owner username
+    group username
     mode "0600"
 
     not_if { File.exists?(File.join(home_dir, ".ssh", "config")) }
   end
 
-  execute "generate ssh keypair for #{user}" do
+  execute "generate ssh keypair for #{username}" do
     command "ssh-keygen -q -N '' -f #{home_dir}/.ssh/id_rsa"
 
     not_if { File.exists?(File.join(home_dir, ".ssh", "id_rsa")) }
   end
 
-  file "ensure ssh private key ownership for #{user}" do
+  file "ensure ssh private key ownership for #{username}" do
     path "#{home_dir}/.ssh/id_rsa"
-    owner user
-    group user
+    owner username
+    group username
     mode "0400"
   end
 
-  file "ensure ssh public key ownership for #{user}" do
+  file "ensure ssh public key ownership for #{username}" do
     path "#{home_dir}/.ssh/id_rsa.pub"
-    owner user
-    group user
+    owner username
+    group username
   end
 
-  execute "copy public key into authorized_keys for #{user}" do
+  execute "copy public key into authorized_keys for #{username}" do
     command "cat #{home_dir}/.ssh/id_rsa.pub | tee -a #{home_dir}/.ssh/authorized_keys"
 
     not_if do
@@ -76,6 +92,13 @@ end
       ($? == 0)
     end
   end
+
+  file "ensure ssh authorized_keys ownership for #{username}" do
+    path "#{home_dir}/.ssh/authorized_keys"
+    owner username
+    group username
+  end
+
 end
 
 file "remove update-motd" do
@@ -111,16 +134,3 @@ execute "set chef-client logging to debug" do
     ($? == 0)
   end
 end
-
-
-################################################################################
-# CHEF-SOLR / APACHE SOLR
-################################################################################
-
-# template "install custom solr config" do
-#   path "/var/lib/chef/solr/conf/solrconfig.xml"
-#   source "solrconfig.erb"
-#   owner "chef"
-#   group "chef"
-#   mode "0644"
-# end

data/cucumber-chef.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.add_dependency("rake", ">= 0.9.2")
   s.add_dependency("thor", ">= 0.15.2")
   s.add_dependency("ubuntu_ami", ">= 0.4.0")
-  s.add_dependency("ztk", ">= 1.0.8")
+  s.add_dependency("ztk", ">= 1.0.9")
 
   s.add_development_dependency("simplecov", ">= 0.6.4")
   s.add_development_dependency("pry", ">= 0")

data/lib/cucumber/chef/client.rb

@@ -49,32 +49,30 @@ module Cucumber
 
         # PUSH CHEF-REPO
         #################
-        if environment_variable_set?("PUSH")
-          # Upload all of the chef-repo environments
-          ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo environments to the test lab", :mark => "completed in %0.4f seconds.") do
-            @test_lab.knife_cli(%(environment from file ./environments/*.rb), :silence => true)
-          end
 
-          # Upload all of the chef-repo cookbooks
-          ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo cookbooks to the test lab", :mark => "completed in %0.4f seconds.") do
-            cookbook_paths = ["./cookbooks"]
-            cookbook_paths << "./site-cookbooks" if Cucumber::Chef::Config.librarian_chef
-            @test_lab.knife_cli(%(cookbook upload --all --cookbook-path #{cookbook_paths.join(':')} --force), :silence => true)
-          end
+        # Upload all of the chef-repo environments
+        ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo environments to the test lab", :mark => "completed in %0.4f seconds.") do
+          @test_lab.knife_cli(%(environment from file ./environments/*.rb), :silence => true)
+        end
 
-          # Upload all of the chef-repo roles
-          ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo roles to the test lab", :mark => "completed in %0.4f seconds.") do
-            @test_lab.knife_cli(%(role from file ./roles/*.rb), :silence => true)
-          end
+        # Upload all of the chef-repo cookbooks
+        ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo cookbooks to the test lab", :mark => "completed in %0.4f seconds.") do
+          cookbook_paths = Cucumber::Chef::Config.chef[:cookbook_paths]
+          @test_lab.knife_cli(%(cookbook upload --all --cookbook-path #{cookbook_paths.join(':')} --force), :silence => true)
+        end
 
-          # Upload all of our chef-repo data bags
-          Dir.glob("./data_bags/*").each do |data_bag_path|
-            next if !File.directory?(data_bag_path)
-            ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo data bag '#{File.basename(data_bag_path)}' to the test lab", :mark => "completed in %0.4f seconds.") do
-              data_bag = File.basename(data_bag_path)
-              @test_lab.knife_cli(%(data bag create "#{data_bag}"), :silence => true)
-              @test_lab.knife_cli(%(data bag from file "#{data_bag}" "#{data_bag_path}"), :silence => true)
-            end
+        # Upload all of the chef-repo roles
+        ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo roles to the test lab", :mark => "completed in %0.4f seconds.") do
+          @test_lab.knife_cli(%(role from file ./roles/*.rb), :silence => true)
+        end
+
+        # Upload all of our chef-repo data bags
+        Dir.glob("./data_bags/*").each do |data_bag_path|
+          next if !File.directory?(data_bag_path)
+          ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo data bag '#{File.basename(data_bag_path)}' to the test lab", :mark => "completed in %0.4f seconds.") do
+            data_bag = File.basename(data_bag_path)
+            @test_lab.knife_cli(%(data bag create "#{data_bag}"), :silence => true)
+            @test_lab.knife_cli(%(data bag from file "#{data_bag}" "#{data_bag_path}"), :silence => true)
           end
         end
 

data/lib/cucumber/chef/config.rb

@@ -170,18 +170,15 @@ module Cucumber
       mode              :user
       prerelease        (Cucumber::Chef.is_rc? ? true : false)
 
-      librarian_chef    false
-
       user              (ENV['OPSCODE_USER'] || ENV['USER'])
 
       artifacts         ({"chef-client-log" => "/var/log/chef/client.log",
                           "chef-client-stacktrace" => "/var/chef/cache/chef-stacktrace.out"})
 
-      chef              ({:client_version => "10.18.2",
-                          :server_version => "10.18.2",
-                          :amqp_password => "p@ssw0rd1",
-                          :admin_password => "p@ssw0rd1",
-                          :render_client_rb => true})
+      chef              ({:version => "latest",
+                          :default_password => "p@ssw0rd1",
+                          :render_client_rb => true,
+                          :cookbook_paths => %w(cookbooks)})
 
       test_lab          ({:hostname => "cucumber-chef",
                           :tld => "test-lab"})
@@ -190,7 +187,8 @@ module Cucumber
 
       provider          :vagrant
 
-      aws               ({:lab_user => "ubuntu",
+      aws               ({:bootstrap_user => "ubuntu",
+                          :lab_user => "cucumber-chef",
                           :lxc_user => "root",
                           :ssh => {
                             :lab_port => 22,
@@ -202,12 +200,16 @@ module Cucumber
                           :aws_instance_type => "m1.small",
                           :aws_security_group => "cucumber-chef"})
 
-      vagrant           ({:lab_user => "vagrant",
+      vagrant           ({:bootstrap_user => "vagrant",
+                          :lab_user => "cucumber-chef",
                           :lxc_user => "root",
                           :ssh => {
+                            :lab_ip => "127.0.0.1",
                             :lab_port => 2222,
                             :lxc_port => 22
-                          } })
+                          },
+                          :cpus => 1,
+                          :memory => 1024 })
 
 ################################################################################
 

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[:server_version]}'), :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)
             if distro.downcase == "fedora"
               @test_lab.bootstrap_ssh.exec(%(sudo chroot #{cache_rootfs} /bin/bash -c 'rpm -Uvh --nodeps /tmp/*rpm'), :silence => true)
             end
@@ -237,13 +237,16 @@ module Cucumber
             @test_lab.bootstrap_ssh.exec(%(sudo #{create_command(name, distro, release, arch)}), :silence => true)
           end
 
-          lab_ssh_path = File.join(Cucumber::Chef.lab_user_home_dir, ".ssh")
-          ssh_path = File.join(root(name), Cucumber::Chef.lxc_user_home_dir, ".ssh")
+          lab_user_ssh_path = File.join(Cucumber::Chef.lab_user_home_dir, ".ssh")
+          lxc_user_ssh_path = File.join(Cucumber::Chef.lxc_user_home_dir, ".ssh")
+
+          lxc_ssh_path = File.join(root(name), Cucumber::Chef.lxc_user_home_dir, ".ssh")
           motd_path = File.join(root(name), "etc", "motd")
 
-          @test_lab.bootstrap_ssh.exec(%(sudo mkdir -vp #{ssh_path}), :silence => true)
-          @test_lab.bootstrap_ssh.exec(%(sudo chmod 0700 #{ssh_path}), :silence => true)
-          @test_lab.bootstrap_ssh.exec(%(sudo cat #{File.join(lab_ssh_path, "id_rsa.pub")} | sudo tee -a #{File.join(ssh_path, "authorized_keys")}), :silence => true)
+          @test_lab.bootstrap_ssh.exec(%(sudo mkdir -vp #{lxc_ssh_path}), :silence => true)
+          @test_lab.bootstrap_ssh.exec(%(sudo chmod 0700 #{lxc_ssh_path}), :silence => true)
+          @test_lab.bootstrap_ssh.exec(%(sudo cat #{File.join(lab_user_ssh_path, "id_rsa.pub")} | sudo tee -a #{File.join(lxc_ssh_path, "authorized_keys")}), :silence => true)
+          @test_lab.bootstrap_ssh.exec(%(sudo cat #{File.join(lxc_user_ssh_path, "id_rsa.pub")} | sudo tee -a #{File.join(lxc_ssh_path, "authorized_keys")}), :silence => true)
 
           @test_lab.bootstrap_ssh.exec(%(sudo rm -vf #{motd_path}), :silence => true)
           @test_lab.bootstrap_ssh.exec(%(sudo cp -v /etc/motd #{motd_path}), :silence => true)

data/lib/cucumber/chef/provider.rb

@@ -71,6 +71,10 @@ module Cucumber
 
 ################################################################################
 
+      def ip
+        (Cucumber::Chef.lab_ip || super(:ip))
+      end
+
       def port
         (Cucumber::Chef.lab_ssh_port || super(:port))
       end

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

@@ -44,7 +44,20 @@ module Cucumber
 
         def create
           ZTK::Benchmark.bench(:message => "Creating #{Cucumber::Chef::Config.provider.upcase} instance", :mark => "completed in %0.4f seconds.", :stdout => @stdout) do
-            self.vagrant_cli("up")
+
+            context = {
+              :ip => Cucumber::Chef.lab_ip,
+              :cpus => Cucumber::Chef::Config.vagrant[:cpus],
+              :memory => Cucumber::Chef::Config.vagrant[:memory]
+            }
+
+            vagrantfile_template = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "cucumber-chef", "Vagrantfile.erb")
+
+            vagrantfile = File.join(Cucumber::Chef.chef_repo, "Vagrantfile")
+
+            !File.exists?(vagrantfile) and IO.write(vagrantfile, ::ZTK::Template.render(vagrantfile_template, context))
+
+            self.vagrant_cli("up", id)
             ZTK::TCPSocketCheck.new(:host => self.ip, :port => self.port, :wait => 120).wait
           end
 
@@ -62,7 +75,7 @@ module Cucumber
 
         def destroy
           if exists?
-            self.vagrant_cli("destroy", "--force")
+            self.vagrant_cli("destroy", "--force", id)
           else
             raise VagrantError, "We could not find a test lab!"
           end
@@ -79,7 +92,7 @@ module Cucumber
 
         def up
           if (exists? && dead?)
-            self.vagrant_cli("up")
+            self.vagrant_cli("up", id)
             ZTK::TCPSocketCheck.new(:host => self.ip, :port => self.port, :wait => 120).wait
           else
             raise VagrantError, "We could not find a powered off test lab."
@@ -97,7 +110,7 @@ module Cucumber
 
         def down
           if (exists? && alive?)
-            self.vagrant_cli("halt")
+            self.vagrant_cli("halt", id)
           else
             raise AWSError, "We could not find a running test lab."
           end
@@ -114,7 +127,7 @@ module Cucumber
 
         def reload
           if (exists? && alive?)
-            self.vagrant_cli("reload")
+            self.vagrant_cli("reload", id)
           else
             raise AWSError, "We could not find a running test lab."
           end
@@ -142,7 +155,7 @@ module Cucumber
 ################################################################################
 
         def id
-          "default"
+          "test-lab-#{ENV['USER']}".downcase
         end
 
         def state