vagabond 0.2.8 → 0.2.10

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## v0.2.10
+* Fix `:berkshelf` key to be optionally Hash type
+* Allow all types for roles/environments/data bags
+* Add guards for uploads of file types (thanks @jaypipes)
+* Raise exception on failed provisions
+* Force utf-8 on all files
+* Better output on parallel cluster builds
+* Use Librarian to vendor internal cookbooks at runtime
+* Provide `spec` support within isolated cookbooks (outside of chef-repo)
+* Make `server` nodes ephemeral
+* Build base erchef server containers with versions
+* Customize host provisioning cookbook versions based on dev/release version
+* Added callbacks
+* Allow passing commands to nodes via `ssh` action
+* Lots of cleanup and other stuff that's not jumping out of the git history
+
 ## v0.2.8
 * Disable `chef-server` clone on provision (#14)
 * Temporarily disable provision on init action

data/DEVELOP.md

@@ -0,0 +1,38 @@
+# Hacking Vagabond
+
+Here's some useful notes about hacking on Vagabond
+
+## Git branch
+
+Unstable development is on the `develop` branch. Pull requests should
+be based on the `develop` branch and any changes will be merged there
+prior to being merged into `master`. The `master` branch will always
+be the currently stable released version.
+
+## Versioning
+
+Stable versions will always be even numbered patch levels. Unstable
+versions will always be odd numbered patch levels.
+
+### Unstable behavior
+
+When unstable versions are detected vagabond will provision the system
+differently than when within stable versions. The Cheffile used to vendor
+cookbooks for provisioning the host will use cookbook linked to unstable
+versions of the cookbooks, and these will be updated every hour.
+
+Since stable versions of vagabond will link directly to released versions
+of cookbooks, a single update to pull the dependencies is sufficient. In
+development mode with cookbooks linked to changing cookbooks, getting updates
+will be required as the code is updated.
+
+## Debugging
+
+Vagabond will not print stacktraces by default when an error is encountered.
+To enable stacktraces on errors, set the environment variable `VAGABOND_EXIT_DEBUG`
+prior to running a command. Alternatively you can export the variable so it
+will always be set:
+
+```
+$ export VAGABOND_EXIT_DEBUG=true
+```

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant', :tag => 'v1.2.1'

data/Gemfile.lock

@@ -0,0 +1,33 @@
+GIT
+  remote: git://github.com/mitchellh/vagrant
+  revision: a7853fe7b7f08dbedbc934eb9230d33be6bf746f
+  tag: v1.2.1
+  specs:
+    vagrant (1.2.1)
+      childprocess (~> 0.3.7)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6.0)
+      json (>= 1.5.1, < 1.8.0)
+      log4r (~> 1.1.9)
+      net-scp (~> 1.1.0)
+      net-ssh (~> 2.6.6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    erubis (2.7.0)
+    ffi (1.9.3)
+    i18n (0.6.5)
+    json (1.7.7)
+    log4r (1.1.10)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  vagrant!

data/README.md

@@ -38,33 +38,47 @@ Hash you return. Heres a simple example:
   :nodes => {
     :precise => {
       :template => 'ubuntu_1204',
-      :run_list => %w(role[base])
-    },
-    :db => {
-      :template => 'ubuntu_1204',
-      :run_list => %w(role[db])
+      :run_list => ['role[base]']
     }
   },
-  :local_chef_server => {
+  :server => {
     :enabled => true,
-    :auto_upload => true
+    :auto_upload => true,
+    :librarian => true,
+    :berkshelf => false
   }
 }
 ```
+We can also use the `describe` DSL instead of building hashes directly:
 
+```ruby
+Vagabond::Vagabondfile.describe do
+  nodes do
+    precise do
+      template 'ubuntu_1204'
+      run_list ['role[base]']
+    end
+  end
+  server do
+    enabled true
+    auto_upload true
+    librarian true
+    berkshelf false
+  end
+end
+```
 Now, to create a node, simply run:
 
 ```
-$ vagabond up db
+$ vagabond up precise
 ```
 
-This command will bootstrap the installation of LXC utilities and base
-containers prior to starting up a linux container. It does this by
-running the vagabond chef recipe embedded in this gem at
-`lib/vagabond/cookbooks/vagabond/recipes/default.rb`. 
+## System preparation
 
-To only prepare your system for LXC fun and generate a simple vagabond
-file, do the following:
+Vagabond will provision the host system automatically as required to create
+required base lxc templates and ensure proper configuration. However, we can
+also initialize the system directly and create required base images using the
+`init` action:
 
 ```
 $ vagabond init
@@ -72,8 +86,9 @@ $ vagabond init
 
 This command runs the chef recipe and generates a basic Vagabondfile and
 creates the base containers specified in that file. Those base
-containers are Ubuntu 12.04 and CentOS 6.3. This creation process will
-take a while so now is a good time to get a fresh pot of coffee.
+containers are Ubuntu 12.04 and CentOS 6. This creation process can
+take a while depending on download speeds so now is a good time to get a 
+fresh pot of coffee.
 
 Pretty simple, right?
 
@@ -81,13 +96,13 @@ Pretty simple, right?
 
 Currently builtin templates:
 
+* ubuntu_1004
 * ubuntu_1204
 * ubuntu_1210
 * debian_6
 * debian_7
-* centos_58
-* centos_63
-* centos_64
+* centos_5
+* centos_6
 
 ## Commands
 
@@ -106,6 +121,19 @@ local server option is enabled. It's just an important bit of information
 to remember so you can make a mental note to stop or freeze it when not
 in use. Or just let them run. What ever floats your boat.
 
+### Lightweight chef server
+
+Vagabond also supports chef-zero instead of running a full blown erchef
+instance. You can specify this by setting it within the `server` block:
+
+```ruby
+...
+  server do
+    zero true
+  end
+...
+```
+
 ### Vagabond knife
 
 Since you can have a local chef server running, it can also be helpful
@@ -215,7 +243,7 @@ keys can be repeated `n` times to provide multiple nodes of a specific type.
 ### Usage
 
 ```
-$ vagabond spec my_cluster
+$ vagabond spec start my_cluster
 ```
 
 ### Applying specs
@@ -242,7 +270,7 @@ against actual live infrastructure to see if it is currently in a valid
 state based on existing specs. Awesome!
 
 ```
-$ vagabond spec my_cluster --environment production
+$ vagabond spec start my_cluster --irl --environment production
 ```
 
 ## Important note
@@ -262,6 +290,10 @@ boring old `sudo`, you can do that to:
 :sudo => 'rvmsudo'
 ```
 
+Vagabond will attempt to be smart about determining how to sudo. So if the
+`sudo` option is not set (`nil`) it will discover its environment and use
+`sudo` or `rvmsudo` accordingly.
+
 ## Extra note
 
 This thing is still very new and shiny with lots of sharp edges. They
@@ -286,4 +318,6 @@ get help making things better!
 
 ## Infos
 
+* Issues: https://github.com/chrisroberts/vagabond/issues
 * Repository: https://github.com/chrisroberts/vagabond
+* IRC: #vagabond @ Freenode

data/USAGE.md

@@ -73,6 +73,23 @@ to then use that template:
 }
 ```
 
+## Assigning static IP addresses to nodes
+
+Nodes can be assigned static IP addresses using the `:ipaddress` key in
+the node's Hash:
+
+```ruby
+{
+  :nodes => {
+    :my_precise_node => {
+      :template => 'ubuntu_1204',
+      :run_list => ['role[base]'],
+      :ipaddress => '10.0.0.10'
+    }
+  }
+  ...
+```
+
 ## vagabond
 
 The `vagabond` command is used for interaction with nodes. Simply running:
@@ -92,6 +109,12 @@ provide the name and it will drop you into a root session:
 $ vagabond ssh my_precise_node
 ```
 
+or run a command remotely on the given node:
+
+```
+$ vagabond ssh my_precise_node ps -AH ux
+```
+
 ## vagabond server
 
 Vagabond will optionally allow the installation of a chef server that is
@@ -107,7 +130,7 @@ look like this:
       :run_list => ['role[base]']
     }
   },
-  :local_chef_server => {
+  :server => {
     :enabled => true
   }
 }
@@ -120,11 +143,13 @@ Vagabond. The server commands are explicitly for the server container.
 The commands are similar to the basic `vagabond` commands, with a few
 extra commands as well.
 
-The `:local_chef_server` hash also has two helper keys for setting up
+The `:server` hash has a few helper keys for setting up
 the server:
 
 * `:auto_upload` - Uploads all cookbooks, roles, data bags and environments after build
 * `:berkshelf` - Uses berkshelf for cookbook upload instead of knife
+* `:librarian` - Uses librarian for cookbook upload instead of knife
+* `:zero` - Uses Chef Zero instead of Chef 11 (erchef)
 
 ## vagabond knife
 
@@ -194,4 +219,4 @@ Simple, yet so very very awesome. \o/
 
 Testing support is still very young, just like Vagabond. But there are plans
 in the works for more features. Take a look at the issues section in github
-with `kitchen` tags. Feel free to add more if you see something missing!
+with `kitchen` tags. Feel free to add more if you see something missing!

data/Vagabondfile.sample

@@ -0,0 +1,47 @@
+Vagabond::Vagabondfile.describe do
+  defaults do
+    template 'ubuntu_1204'
+    environment 'testing'
+    run_list ['recipe[apt]']
+  end
+  definitions do
+    database do
+      template 'ubuntu_1204'
+      run_list ['recipe[internal::db]']
+    end
+    web_site do
+      run_list ['recipe[internal::website]']
+      attributes do
+        apache do
+          ports %w(80 443)
+        end
+      end
+    end
+  end
+  nodes do
+    db do
+      definition 'database'
+      environment 'production'
+      custom_specs %w(blah blah blah)
+    end
+    db_slave.definition 'database'
+    db_slave.attributes.internal.database.role 'slave'
+  end
+  clusters do
+    db ['db', 'db_slave']
+  end
+  specs.clusters do
+    db do
+      overrides.environment 'staging'
+      provision do
+        times 4
+        spec :after_2, :after_4
+        after(2) do
+          run.on.db '/usr/bin/fail_database'
+          pause 3
+        end
+        after.every.run '/usr/bin/log_database_state'
+      end
+    end
+  end
+end

data/Vagrantfile

@@ -2,9 +2,15 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.hostname = "sensu-lxc-host"
-  config.vm.box = 'precise-64-lxc-preseed'
-  config.vm.box_url = 'http://vagrant.hw-ops.com/precise-64-lxc-preseed.box'
+  config.vm.hostname = "vagabond-lxc-host"
+
+  unless(ENV['DISABLE_PRESEED'])
+    config.vm.box = 'precise-64-lxc-preseed'
+    config.vm.box_url = 'http://vagrant.hw-ops.com/precise-64-lxc-preseed.box'
+  else
+    config.vm.box = 'precise-64'
+    config.vm.box_url = 'https://github.com/downloads/chrisroberts/vagrant-boxes/precise-64.box'
+  end
 
   if(ENV['ENABLE_APT_PROXY'])
     proxy = [
@@ -20,9 +26,15 @@ Vagrant.configure("2") do |config|
       proxy + [
         "lxc-destroy -n ubuntu_1204",
         "apt-get update",
-        "apt-get install -y -q ruby1.9.1-full git",
+        "apt-get install -y -q python-software-properties git build-essential",
+        "add-apt-repository ppa:brightbox/ruby-ng",
+        "apt-get update",
+        "apt-get install -y -q ruby1.9.1 ruby1.9.1-dev",
         "gem install --no-ri --no-rdoc bundler",
-        "gem install --no-ri --no-rdoc vagabond"
+        "cd /home/vagrant",
+        %(echo "source 'https://rubygems.org'\ngem 'vagabond', path: '/vagrant'\n" > Gemfile),
+        "bundle install --binstubs",
+        "chown -R vagrant:vagrant /home/vagrant"
       ]
     ).join("\n")
   end

data/bin/vagabond

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#encoding: utf-8
 
 Signal.trap('INT'){ exit 255 }
 
@@ -44,6 +45,10 @@ else
       Vagabond::Vagabond
     end.start
   rescue Vagabond::VagabondError => e
+    $stderr.puts "Vagabond error encountered. Exiting: #{e}"
+    if(ENV['VAGABOND_EXIT_DEBUG'])
+      puts "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+    end
     exit e.exit_code
   rescue Exception => e
     $stderr.puts "Vagabond exiting. Reason: #{e}"

data/lib/vagabond/Cheffile

@@ -0,0 +1,7 @@
+site 'http://community.opscode.com/api/v1'
+
+cookbook 'vagabond', '1.0.4'
+cookbook 'lxc', '1.1.4'
+cookbook 'chef-server-populator', '0.3.0'
+
+cookbook 'chef-server', '2.0.0'

data/lib/vagabond/Cheffile.dev

@@ -0,0 +1,7 @@
+site 'http://community.opscode.com/api/v1'
+
+cookbook 'vagabond', git: 'git://github.com/chrisroberts/chef-vagabond.git', ref: 'develop'
+cookbook 'lxc', git: 'git://github.com/hw-cookbooks/lxc.git', ref: 'develop'
+cookbook 'chef-server-populator', git: 'git://github.com/hw-cookbooks/chef-server-populator.git', ref: 'develop'
+
+cookbook 'chef-server', '2.0.0'

data/lib/vagabond/actions/cluster.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module Cluster
@@ -33,20 +34,22 @@ module Vagabond
         clr = vagabondfile[:clusters][name] if vagabondfile[:clusters]
         if(clr)
           ui.info "#{ui.color('Vagabond:', :bold)} Building cluster - #{ui.color(name, :green)}"
-          if(vagabondfile[:local_chef_server] && vagabondfile[:local_chef_server][:enabled])
+          if(vagabondfile.local_chef_server?)
             require 'vagabond/server'
             srv = ::Vagabond::Server.new
-            srv.send(:setup, 'up')
-            srv.execute
-            # Reload so we get proper values
-            load_configurations
+            srv.options = options.dup
+            srv.options[:auto_provision] = true
+            unless(srv.lxc.running?)
+              srv.up
+              # Reload so we get proper values
+              configure
+            end
           end
           cluster_instances = clr.map do |n|
             ui.info "Building #{n} for cluster!"
             v_inst = Vagabond.new
             v_inst.options = options.dup
-            v_inst.send(:setup, 'up', n, :ui => ui)
-            v_inst.execute
+            v_inst.up(n, :ui => ui)
             if(options[:delay].to_i > 0 && n != clr.last)
               ui.warn "Delay requested between node processing. Sleeping for #{options[:delay].to_i} seconds."
               sleep(options[:delay].to_i)
@@ -59,7 +62,18 @@ module Vagabond
               inst.wait_for_completion
             end
           end
-          ui.info "  -> #{ui.color("Built cluster #{name}", :green)}"
+          failed = cluster_instances.map{|i|i.send(:tasks)}.map(&:values).flatten.detect do |hash|
+            hash[:result] == false
+          end
+          result = failed ? ['FAILED', :red, :bold] : ['SUCCESS', :green, :bold]
+          ui.info "\nCluster build #{name}: #{ui.color(*result)}"
+          cluster_instances.each do |inst|
+            failed = inst.send(:tasks).values.flatten.detect do |hash|
+              hash[:result] == false
+            end
+            result = failed ? ['FAILED', :red, :bold] : ['SUCCESS', :green, :bold]
+            ui.info "  -> #{inst.name}: #{ui.color(*result)}"
+          end
         else
           ui.error "Cluster name provided does not exist: #{name}"
         end