vagabond 0.2.0 → 0.2.2

data/lib/vagabond/actions/init.rb

@@ -0,0 +1,75 @@
+module Vagabond
+  module Actions
+    module Init
+      class << self
+        def included(klass)
+          klass.class_eval do
+            class << self
+              def _init_desc
+                ['init', 'initialize the Vagabondfile and setup LXC if needed.']
+              end
+            end
+          end
+        end
+      end
+
+      def _init
+        do_init
+      end
+
+      private
+
+      def empty_vagabondfile_hash
+        require 'chef/node'
+        node = Chef::Node.new
+        node.from_file(
+          File.join(
+            File.dirname(__FILE__),
+            '../cookbooks/vagabond/attributes/default.rb'
+          )
+        )
+        nodes = {}
+        node[:vagabond][:bases].keys.each do |template|
+          answer = nil
+          until(%w(n y).include?(answer))
+            answer = ui.ask_question("Include template: #{template} ", :default => 'y').downcase
+          end
+          if(answer.downcase == 'y')
+            ui.info "Enabling template #{template} with node name #{template.gsub('_', '')}"
+            nodes[template.gsub('_', '').to_sym] = {
+              :template => template,
+              :run_list => []
+            }
+          else
+            ui.warn "Skipping instance for template #{template}"
+          end
+        end
+        {
+          :nodes => nodes,
+          :clusters => {},
+          :local_chef_server => {
+            :zero => false,
+            :berkshelf => false,
+            :librarian => false,
+            :enabled => false,
+            :auto_upload => true
+          },
+          :sudo => true
+        }
+      end
+        
+      def do_init
+        if(File.exists?(vagabondfile.path))
+          ui.confirm('Overwrite existing Vagabondfile', true)
+          ui.info 'Overwriting existing Vagabondfile'
+        end
+        require 'pp'
+        File.open(vagabondfile.path, 'w') do |file|
+          file.write(empty_vagabondfile_hash.pretty_inspect)
+        end
+        @vagabondfile.load_configuration!
+        @internal_config = InternalConfiguration.new(@vagabondfile, ui, options)
+      end
+    end
+  end
+end

data/lib/vagabond/actions/provision.rb

@@ -29,10 +29,12 @@ module Vagabond
         debug(com)
         # Send the live stream out since people will generally want to
         # know what's happening
-        cmd = Mixlib::ShellOut.new(com, :live_stream => STDOUT)
+        cmd = Mixlib::ShellOut.new(com, :live_stream => STDOUT, :timeout => 2000)
         cmd.run_command
         # NOTE: cmd.status.success? won't be valid, so check for FATAL
-        unless(cmd.stdout.split("\n").last.to_s.include?('FATAL'))
+        # TODO: This isn't really the best check, but should be good
+        # enough for now
+        unless(cmd.stdout.include?('FATAL: Stacktrace'))
           ui.info ui.color('  -> PROVISIONED', :magenta)
           true
         else

data/lib/vagabond/actions/status.rb

@@ -18,14 +18,25 @@ module Vagabond
       end
       
       def _status
-        ui.info ui.color("Vagabond node status:\n", :bold)
+        status = [
+          ui.color('Name', :bold),
+          ui.color('State', :bold),
+          ui.color('PID', :bold),
+          ui.color('IP', :bold)
+        ]
         if(name)
-          status_for(name)
+          status += status_for(name)
         else
-          (Array(vagabondfile[:boxes].keys) | Array(internal_config[mappings_key].keys)).sort.each do |n|
-            status_for(n)
+          if(self.is_a?(Vagabond))
+            names = (Array(vagabondfile[:boxes].keys) | Array(internal_config[mappings_key].keys))
+          else
+            names = Array(internal_config[mappings_key].keys)
+          end
+          names.sort.each do |n|
+            status += status_for(n)
           end
         end
+        puts ui.list(status, :uneven_columns_across, 4)
       end
 
       private
@@ -35,27 +46,27 @@ module Vagabond
         state = nil
         status = []
         if(Lxc.exists?(m_name))
-          @lxc = Lxc.new(m_name) unless lxc.name == m_name
+          @lxc = Lxc.new(m_name) unless defined?(lxc) && lxc.name == m_name
           info = Lxc.info(m_name)
-          state = info[:state]
-          status << "PID: #{info[:pid] == -1 ? 'N/A' : info[:pid]}"
-          status << "Address: #{lxc.container_ip || 'unknown'}"
-          status << "\n"
-        end
-        case state
-        when :running
-          color = :green
-        when :frozen
-          color = :blue
-        when :stopped
-          color = :yellow
+          case info[:state]
+          when :running
+            color = :green
+          when :frozen
+            color = :blue
+          when :stopped
+            color = :yellow
+          else
+            color = :red
+          end
+          status << ui.color(c_name, color)
+          status << (info[:state] || 'N/A').to_s
+          status << (info[:pid] == -1 ? 'N/A' : info[:pid]).to_s
+          status << (@lxc.container_ip || 'unknown')
         else
-          color = :red
-        end
-        ui.info ui.color("  #{c_name}: #{state || "Not currently created\n"}", color)
-        unless(status.empty?)
-          ui.info(status.map{|s| "    #{s}"}.join("\n").chomp)
+          status << ui.color(c_name, :red)
+          status += ['N/A'] * 3
         end
+        status
       end
     end
   end

data/lib/vagabond/actions/up.rb

@@ -23,10 +23,17 @@ module Vagabond
             lxc.start
             ui.info ui.color('  -> STARTED', :green)
           end
+        end
+        if(options[:parallel])
+          @threads[:up] ||= []
+          @threads[:up] << Thread.new do
+            _create
+            do_provision if options[:auto_provision]
+          end
         else
           _create
+          do_provision if options[:auto_provision]
         end
-        do_provision if options[:auto_provision]
       end
 
     end

data/lib/vagabond/bootstraps/server-zero.erb

@@ -0,0 +1,20 @@
+bash -c '
+
+apt-get install -y -q wget
+
+mkdir -p /var/chef/cookbooks/vagabond
+mkdir -p /var/chef/cookbooks/lxc
+wget -qO- https://github.com/chrisroberts/chef-vagabond/tarball/master | tar xvzC /var/chef/cookbooks/vagabond --strip-components=1
+wget -qO- https://github.com/hw-cookbooks/lxc/tarball/master | tar xvzC /var/chef/cookbooks/lxc --strip-components=1
+
+(
+echo "
+{
+  \"run_list\": [ \"recipe[vagabond::zero]\" ]
+}
+"
+) > /tmp/chef-server.json
+
+chef-solo -j /tmp/chef-server.json
+
+'

data/lib/vagabond/bootstraps/server.erb

@@ -1,7 +1,5 @@
 bash -c '
-
 apt-get install -y -q wget
-curl -L https://www.opscode.com/chef/install.sh | sudo bash
 mkdir -p /var/chef/cache /var/chef/cookbooks/chef-server /var/chef/cookbooks/chef-server-populator
 wget -qO- https://github.com/opscode-cookbooks/chef-server/archive/master.tar.gz | tar xvzC /var/chef/cookbooks/chef-server --strip-components=1
 wget -qO- https://github.com/hw-cookbooks/chef-server-populator/tarball/master | tar xvzC /var/chef/cookbooks/chef-server-populator --strip-components=1
@@ -36,6 +34,9 @@ echo "
       \"chef_server_webui\": {
         \"enable\": false
       }
+    },
+    \"erchef\": {
+      \"s3_url_ttl\": 3600
     }
   },
   \"chef_server_populator\": {

data/lib/vagabond/constants.rb

@@ -18,19 +18,4 @@ module Vagabond
     :destroyed => :red,
     :kitchen => [:cyan, :bold]
   )
-  
-  EXIT_CODES = Mash.new(
-    :success => 0,
-    :reserved_name => 1,
-    :invalid_name => 2,
-    :invalid_base_template => 3,
-    :invalid_action => 4,
-    :invalid_template => 5,
-    :kitchen_missing_yml => 6,
-    :kitchen_no_cookbook_arg => 7,
-    :kitchen_too_many_args => 8,
-    :kitchen_invalid_platform => 9,
-    :missing_node_name => 10,
-    :cluster_invalid => 11
-  )
 end

data/lib/vagabond/cookbooks/lxc/CHANGELOG.md

@@ -1,3 +1,19 @@
+## v1.0.0
+* Extract container actions out to new LWRP `lxc`
+* Update `container` to use `lxc` resource for container actions
+* Update `container` to allow nested subresources for `interface` and `fstab_mount`
+* Fix `interface` LWRP to allow IPv6 based values
+* Remove static_ip config set as it was introducing bogus route
+* Provide assumed environment when not available (like when running via runit)
+* Make chef enabled containers properly idempotent
+* Clean up the `container` provider implementation to be more resource based
+* Add `ephemeral` LWRP
+* Add custom ephemeral script to allow host directory overlay or virtual block device
+* Patches execute resource to provide streaming output
+* Updates Lxc library to be more reusable
+* Add proc based network detection for more robust address discovery
+* Shell out directly to ssh for container commands instead of using knife ssh
+
 ## v0.1.0
 * Abstracted out packages for cross-platform support later.
 * Added the 'containers' recipe to create containers for the members of the node['lxc']['containers'] hash

data/lib/vagabond/cookbooks/lxc/Gemfile

@@ -1,3 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
+
+gem 'test-kitchen', git: 'git://github.com/opscode/test-kitchen.git', branch: '1.0'
 
-gem 'test-kitchen'

data/lib/vagabond/cookbooks/lxc/Gemfile.lock

@@ -1,132 +1,41 @@
-GEM
-  remote: http://rubygems.org/
+GIT
+  remote: git://github.com/opscode/test-kitchen.git
+  revision: ab1b878561e896c0619a780d168e71addff2ad91
+  branch: 1.0
   specs:
-    archive-tar-minitar (0.5.2)
-    builder (3.1.4)
-    bunny (0.7.9)
-    chef (10.18.2)
-      bunny (>= 0.6.0, < 0.8.0)
-      erubis
-      highline (>= 1.6.9)
-      json (>= 1.4.4, <= 1.6.1)
-      mixlib-authentication (>= 1.3.0)
-      mixlib-cli (>= 1.1.0)
-      mixlib-config (>= 1.1.2)
-      mixlib-log (>= 1.3.0)
+    test-kitchen (1.0.0.dev)
+      celluloid
       mixlib-shellout
-      moneta (< 0.7.0)
-      net-ssh (~> 2.2.2)
-      net-ssh-multi (~> 1.1.0)
-      ohai (>= 0.6.0)
-      rest-client (>= 1.0.4, < 1.7.0)
-      treetop (~> 1.4.9)
-      uuidtools
-      yajl-ruby (~> 1.1)
-    childprocess (0.3.8)
-      ffi (~> 1.0, >= 1.0.11)
+      net-scp
+      net-ssh
+      pry
+      safe_yaml
+      thor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    celluloid (0.12.4)
+      facter (>= 1.6.12)
+      timers (>= 1.0.0)
     coderay (1.0.9)
-    erubis (2.7.0)
-    excon (0.18.3)
-    ffi (1.4.0)
-    fog (1.9.0)
-      builder
-      excon (~> 0.14)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.0.4)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
-      ruby-hmac
-    foodcritic (1.7.0)
-      erubis
-      gherkin (~> 2.11.1)
-      gist (~> 3.1.0)
-      nokogiri (~> 1.5.4)
-      pry (~> 0.9.8.4)
-      rak (~> 1.4)
-      treetop (~> 1.4.10)
-      yajl-ruby (~> 1.1.0)
-    formatador (0.2.4)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    gist (3.1.1)
-    hashr (0.0.22)
-    highline (1.6.15)
-    i18n (0.6.1)
-    ipaddress (0.8.0)
-    json (1.5.5)
-    librarian (0.0.26)
-      archive-tar-minitar (>= 0.5.2)
-      chef (>= 0.10)
-      highline
-      thor (~> 0.15)
-    log4r (1.1.10)
-    method_source (0.7.1)
-    mime-types (1.21)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.2.2)
-    mixlib-config (1.1.2)
-    mixlib-log (1.4.1)
+    facter (1.6.17)
+    method_source (0.8.1)
     mixlib-shellout (1.1.0)
-    moneta (0.6.0)
-    multi_json (1.6.1)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.2.2)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
-    nokogiri (1.5.6)
-    ohai (6.16.0)
-      ipaddress
-      mixlib-cli
-      mixlib-config
-      mixlib-log
-      mixlib-shellout
-      systemu
-      yajl-ruby
-    polyglot (0.3.3)
-    pry (0.9.8.4)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.6)
+    pry (0.9.12)
       coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
-    rak (1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    ruby-hmac (0.4.0)
-    slop (2.4.4)
-    systemu (2.5.2)
-    test-kitchen (0.7.0)
-      fog
-      foodcritic (>= 1.4.0)
-      hashr (~> 0.0.20)
-      highline (>= 1.6.9)
-      librarian (~> 0.0.20)
-      mixlib-cli (~> 1.2.2)
-      vagrant (~> 1.0.2)
-      yajl-ruby (~> 1.1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    safe_yaml (0.8.5)
+    slop (3.4.4)
     thor (0.17.0)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    uuidtools (2.1.3)
-    vagrant (1.0.6)
-      archive-tar-minitar (= 0.5.2)
-      childprocess (~> 0.3.1)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6.0)
-      json (~> 1.5.1)
-      log4r (~> 1.1.9)
-      net-scp (~> 1.0.4)
-      net-ssh (~> 2.2.2)
-    yajl-ruby (1.1.0)
+    timers (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  test-kitchen
+  test-kitchen!

data/lib/vagabond/cookbooks/lxc/README.md

@@ -1,20 +1,20 @@
-## LXC
+# LXC
 
 Manage linux containers with Chef.
 
-### Recipes
+## Recipes
 
-#### default
+### default
 
 Installs the packages and configuration files needed for lxc on the server. If
 the node uses apt-cacher-ng as a client, the server will be reused when building
 containers.
 
-#### install_dependencies
+### install_dependencies
 
 Installs the packages needed to support lxc's containers.
 
-#### containers
+### containers
 
 This recipe creates all of the containers defined in the `['lxc']['containers']`
 hash. Here is an example of an `example` container:
@@ -22,20 +22,43 @@ hash. Here is an example of an `example` container:
 ```ruby
 node['lxc']['containers']['example'] = { 
   'template' => 'ubuntu',
-  'trim' => , false,
-  'debug' => , true 
+  'initialize_commands' => ['apt-get update']
 }
 ```
 
-You may set `trim` and `debug` to `true` if you need them (default is `false`).
+### knife
 
-Backing store file system and template options are not yet supported.
+Install and manage containers via the knife-remotelxc plugin.
 
-#### knife
+## LWRPs
 
-Install and manage containers via the knife-remotelxc plugin.
+### lxc
+
+Allows for creation, deletion, and cloning of containers
+
+### lxc_config
+
+Allows configuration of the LXC configuration file
+
+### lxc_fstab
+
+Allows defining mounts to be used within the container
 
-### Example
+### lxc_interface
+
+Allows configurations of network interfaces within a container
+
+### lxc_ephemeral
+
+Run a command within an ephemeral container
+
+### lxc_container
+
+Creates a container using the `lxc` LWRP and configures the container
+as requested. This resource also allows nesting `lxc_fstab` and
+`lxc_interface` within the container resource.
+
+## Example
 
 ```ruby
 include_recipe 'lxc'
@@ -47,11 +70,17 @@ lxc_container 'my_container' do
   validator_pem content_from_encrypted_dbag
   run_list ['role[base]']
   chef_enabled true
+  fstab_mount "Persist" do
+    file_system '/opt/file_store'
+    mount_point '/opt/file_store'
+    type 'none'
+    options 'bind,rw'
+  end
 end
 
 lxc_container 'my_container_clone' do
-  action :clone
-  base_container 'my_container'
+  action :create
+  clone 'my_container'
   chef_enabled true
 end