vagabond 0.2.0 → 0.2.2

data/lib/vagabond/cookbooks/lxc/resources/default.rb

@@ -0,0 +1,12 @@
+actions :create, :delete, :clone
+default_action :create
+
+attribute :template, :kind_of => String, :default => 'ubuntu'
+attribute :template_opts, :kind_of => Hash, :default => {}
+attribute :base_container, :kind_of => String
+
+# Backing store options. Not yet in use
+attribute :fstype, :kind_of => String, :default => 'ext4'
+attribute :fssize, :kind_of => String, :default => '2G'
+attribute :vgname, :kind_of => String
+attribute :lvname, :kind_of => String

data/lib/vagabond/cookbooks/lxc/resources/ephemeral.rb

@@ -0,0 +1,13 @@
+actions :run
+default_action :run
+
+attribute :command, :kind_of => String, :required => true
+attribute :bind_directory, :kind_of => String
+attribute :base_container, :kind_of => String, :required => true
+attribute :background, :kind_of => [TrueClass,FalseClass], :default => false
+attribute :union_type, :equal_to => %w(aufs overlayfs), :default => 'overlayfs'
+attribute :user, :kind_of => String, :default => 'root'
+attribute :key, :kind_of => String, :default => '/opt/hw-lxc-config/id_rsa'
+attribute :host_rootfs, :kind_of => String
+attribute :virtual_device, :kind_of => Numeric
+attribute :stream_output, :kind_of => [TrueClass,FalseClass,IO]

data/lib/vagabond/cookbooks/lxc/resources/fstab.rb

@@ -8,4 +8,5 @@ attribute :type, :kind_of => String, :required => true
 attribute :options, :kind_of => [String, Array]
 attribute :dump, :kind_of => Numeric, :default => 0
 attribute :pass, :kind_of => Numeric, :default => 0
-attribute :_lxc
+attribute :auto_join_rootfs_mount, :kind_of => [TrueClass,FalseClass], :default => true
+attribute :create_mount_point, :kind_of => [TrueClass,FalseClass], :default => true

data/lib/vagabond/cookbooks/lxc/resources/interface.rb

@@ -5,6 +5,9 @@ attribute :container, :kind_of => String, :required => true
 attribute :device, :kind_of => String, :required => true
 attribute :auto, :kind_of => [TrueClass, FalseClass], :default => true
 attribute :dynamic, :kind_of => [TrueClass, FalseClass], :default => false
-attribute :address, :regex => %r{\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}}
-attribute :gateway, :regex => %r{\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}}
-attribute :netmask, :regex => %r{\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}}, :default => '255.255.255.0'
+attribute :address, :kind_of => String
+attribute :gateway, :kind_of => String
+attribute :up, :kind_of => String
+attribute :down, :kind_of => String
+attribute :netmask, :kind_of => [String,Numeric]
+attribute :ipv6, :kind_of => [TrueClass,FalseClass], :default => false

data/lib/vagabond/cookbooks/lxc/resources/service.rb

@@ -2,4 +2,4 @@ actions :start, :stop, :halt, :restart, :freeze, :unfreeze
 default_action :start
 
 attribute :service_name, :kind_of => String
-attribute :_lxc
+

data/lib/vagabond/cookbooks/lxc/templates/default/file_content.erb

@@ -0,0 +1,2 @@
+# Chef generated key file
+<%= ::File.read(@path) %>

data/lib/vagabond/cookbooks/lxc/templates/default/interface.erb

@@ -4,18 +4,24 @@
 auto lo
 iface lo inet loopback
 
-<% node[:lxc][:interfaces][@container].each do |net_set| -%>
+<% node.run_state[:lxc][:interfaces][@container].each do |net_set| -%>
 <% if net_set[:auto] -%>
 auto <%= net_set[:device] %>
 <% end -%>
 <% if net_set[:dynamic] -%>
-iface <%= net_set[:device] %> inet dhcp
+iface <%= net_set[:device] %> inet<%= '6' if net_set[:ipv6] %> dhcp
 <% else -%>
-iface <%= net_set[:device] %> inet static
+iface <%= net_set[:device] %> inet<%= '6' if net_set[:ipv6] %> static
   address <%= net_set[:address] %>
 <% if net_set[:gateway] -%>
   gateway <%= net_set[:gateway] %>
 <% end -%>
   netmask <%= net_set[:netmask] %>
+<% if net_set[:up] -%>
+  up <%= net_set[:up] %>
+<% end -%>
+<% if net_set[:down] -%>
+  down <%= net_set[:down] %>
+<% end -%>
 <% end -%>
 <% end %>

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

@@ -0,0 +1,10 @@
+# Vagabond
+
+This cookbooks is used internally by the vagabond project.
+It's general intention is to be used in that fashion, but
+if you want to do something else with it, go nuts.
+
+## Info
+
+* Repository: https://github.com/chrisroberts/chef-vagabond
+* IRC: spox @ Freenode

data/lib/vagabond/cookbooks/vagabond/attributes/default.rb

@@ -15,3 +15,4 @@ default[:vagabond][:bases][:debian_6][:create_environment] = {'SUITE' => 'squeez
 default[:vagabond][:bases][:debian_7][:template] = 'debian'
 default[:vagabond][:bases][:debian_7][:create_environment] = {'SUITE' => 'wheezy'}
 default[:vagabond][:customs] = {}
+default[:vagabond][:server_base] = true

data/lib/vagabond/cookbooks/vagabond/files/default/lxc-centos

@@ -156,16 +156,23 @@ YUM="yum --installroot $INSTALL_ROOT -y --nogpgcheck"
 PKG_LIST="yum initscripts passwd rsyslog vim-minimal dhclient chkconfig"
 PKG_LIST="$PKG_LIST rootfiles policycoreutils centos-release openssh-server avahi"
 MIRRORLIST_URL="http://mirrorlist.centos.org/?release=$release.$releaseminor&arch=$arch&repo=os"
- 
+
+FOUND_MIRRORS=$(curl -s -S -f "$MIRRORLIST_URL")
+AVAIL_MIRRORS="${FOUND_MIRRORS} http://vault.centos.org/$release.$releaseminor/os/$arch"
+
 DOWNLOAD_OK=no
-for trynumber in 1 2 3; do
-[ $trynumber != 1 ] && echo "Trying again..."
-MIRROR_URL=$(curl -s -S -f "$MIRRORLIST_URL" | head -n2 | tail -n1)
+for MIRROR_URL in $AVAIL_MIRRORS; do
 if [ $? -ne 0 ] || [ -z "$MIRROR_URL" ]; then
 echo "Failed to get a mirror"
 continue
 fi
-RELEASE_URL="$MIRROR_URL/Packages/centos-release-$release-$releaseminor.el6.centos.9.$arch.rpm"
+if [ $release = "6" ]; then
+PACKAGE_NAME=`wget -q -O - ${MIRROR_URL}/Packages/ | grep centos-release-${release}.${releaseminor} | sed -r 's/.+rpm">//g' | sed -r 's/<.+//g'`
+RELEASE_URL="$MIRROR_URL/Packages/${PACKAGE_NAME}"
+else
+PACKAGE_NAME=`wget -q -O - ${MIRROR_URL}/CentOS/ | grep centos-release-${release}.${releaseminor} | sed -r 's/.+rpm">//g' | sed -r 's/<.+//g'`
+RELEASE_URL="$MIRROR_URL/CentOS/${PACKAGE_NAME}"
+fi
 echo "Fetching from $RELEASE_URL"
 curl -f "$RELEASE_URL" > $INSTALL_ROOT/centos-release-$release-$releaseminor.centos.$arch.rpm
 if [ $? -ne 0 ]; then
@@ -412,7 +419,7 @@ fi
  
 rootfs_path=$path/rootfs
 config_path=$default_path/$name
-cache=$cache_base/$release
+cache=$cache_base/$release.$releaseminor
  
 revert()
 {

data/lib/vagabond/cookbooks/vagabond/metadata.rb

@@ -1,5 +1,6 @@
 name 'vagabond'
 version '1.0.0'
+license 'Apache 2.0'
 maintainer 'Chris Roberts'
 maintainer_email 'chrisroberts.code@gmail.com'
 

data/lib/vagabond/cookbooks/vagabond/recipes/default.rb

@@ -1,3 +1,37 @@
+
+# TODO: Move this to lxc cookbook proper at some point
+# TODO: Test this on fresh node to ensure start up scripts actuall do
+# what they are expected to
+=begin
+dpkg_autostart 'lxc' do
+  allow false
+end
+
+dpkg_autostart 'lxc-net' do
+  allow false
+end
+=end
+# Start at 0 and increment up if found
+unless(node[:network][:interfaces][:lxcbr0])
+  max = node.network.interfaces.map do |name, val|
+    Array(val[:routes]).map do |route|
+      if(route[:family] == 'inet' && route[:destination].start_with?('10.0'))
+        route[:destination].split('/').first.split('.')[3].to_i
+      end
+    end
+  end.compact.max
+
+  node.default[:vagabond][:lxc_network][:oct] = max ? max + 1 : 0
+  
+  # Test for existing bridge. Use different subnet if found
+  l_net = "10.0.#{node[:vagabond][:lxc_network][:oct]}"
+
+  node.set[:lxc][:addr] = "#{l_net}.1"
+  node.set[:lxc][:network] = "#{l_net}.0/24"
+  node.set[:lxc][:dhcp_range] = "#{l_net}.2,#{l_net}.199"
+  node.set[:lxc][:dhcp_max] = '199'
+end
+
 include_recipe 'lxc'
 
 ruby_block 'LXC template: lxc-centos' do
@@ -57,11 +91,21 @@ node[:vagabond][:bases].each do |name, options|
   end
 end
 
+lxc_container 'chef-server' do
+  clone 'ubuntu_1204'
+  initialize_commands [
+    
+  ]
+  only_if do
+    node[:vagabond][:server_base]
+  end
+end
+
 node[:vagabond][:customs].each do |name, options|
 
   lxc_container name do
-    action :clone
-    base_container options[:base]
+    action :create
+    clone options[:base]
   end
   
   if(options[:memory])
@@ -76,5 +120,3 @@ node[:vagabond][:customs].each do |name, options|
     end
   end
 end
-
-

data/lib/vagabond/cookbooks/vagabond/recipes/zero.rb

@@ -0,0 +1,9 @@
+execute 'apt-get update'
+package 'build-essential'
+gem_package 'chef-zero'
+
+execute 'start chef-zero' do
+  command "start-stop-daemon --background --start --quiet --exec #{File.join(node[:languages][:ruby][:bin_dir],'chef-zero')} -- -H #{node[:ipaddress]} -p 80 start"
+  not_if 'netstat -lpt | grep "tcp[[:space:]]" | grep ruby'
+end
+

data/lib/vagabond/errors.rb

@@ -0,0 +1,23 @@
+module Vagabond
+  class VagabondError < StandardError
+    class << self
+      attr_accessor :exit_code
+    end
+    def exit_code
+      self.class.exit_code
+    end
+  end
+  
+  class VagabondError
+    %w(
+        reserved_name invalid_name invalid_base_template
+        invalid_action invalid_template kitchen_missing_yml
+        kitchen_no_cookbook_args kitchen_too_many_args
+        kitchen_invalid_platform missing_node_name cluster_invalid
+        kitchen_test_failed host_provision_failed spec_failed
+    ).each_with_index do |klass_name, i|
+      klass = klass_name.split('_').map(&:capitalize).join
+      self.class_eval("class #{klass} < VagabondError; self.exit_code = #{i + 1}; end")
+    end
+  end
+end

data/lib/vagabond/helpers.rb

@@ -1,41 +1,68 @@
 require 'vagabond/constants'
+require 'tmpdir'
+require 'uuidtools'
 
 module Vagabond
   module Helpers
+
+    RAND_CHARS = ('a'..'z').map(&:to_s) + ('A'..'Z').map(&:to_s) + (0..9).map(&:to_s)
+    GEN_NAME_LENGTH = 10
+    
     private
+
+    def base_setup
+      @options = options.dup
+      @vagabondfile = Vagabondfile.new(options[:vagabond_file], :allow_missing)
+      Lxc.use_sudo = sudo
+      options[:sudo] = sudo
+      setup_ui
+      @internal_config = InternalConfiguration.new(@vagabondfile, ui, options)
+    end
+    
     def sudo
-      case @vagabondfile[:sudo]
-      when TrueClass
-        'sudo '
+      case vagabondfile[:sudo]
+      when FalseClass
+        ''
       when String
-        "#{@vagabondfile[:sudo]} "
+        "#{vagabondfile[:sudo]} "
+      else
+        'sudo '
       end
     end
 
     def debug(s)
-      ui.info "#{ui.color('DEBUG:', :red, :bold)} #{s}" if options[:debug]
+      ui.info "#{ui.color('DEBUG:', :red, :bold)} #{s}" if options[:debug] && ui
+    end
+
+    def random_name(n=nil)
+      n = name unless n
+      [n, SecureRandom.hex].compact.join('-')
     end
     
     def generated_name(n=nil)
+      seed = vagabondfile.directory.chars.map(&:ord).inject(&:+)
+      srand(seed)
       n = name unless n
       if(@_gn.nil? || @_gn[n].nil?)
         @_gn ||= Mash.new
-        s = Digest::MD5.new
-        s << @vagabondfile.path
-        @_gn[n] = "#{n}-#{s.hexdigest}"
+        @_gn[n] = "#{n}-"
+        GEN_NAME_LENGTH.times do
+          @_gn[n] << RAND_CHARS[rand(RAND_CHARS.size)]
+        end
       end
       @_gn[n]
     end
 
-    def setup_ui(ui=nil)
-      unless(ui)
+    def setup_ui(*args)
+      unless(args.first.is_a?(Chef::Knife::UI))
         Chef::Config[:color] = options[:color].nil? ? true : options[:color]
         @ui = Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
       else
-        @ui = ui
+        @ui = args.first
       end
       options[:debug] = STDOUT if options[:debug]
-      self.class.ui = @ui
+      self.class.ui = @ui unless args.include?(:no_class_set)
+      @ui
     end
 
     def execute
@@ -43,7 +70,7 @@ module Vagabond
         send(@action)
       else
         ui.error "Invalid action received: #{@action}"
-        exit EXIT_CODES[:invalid_action]
+        raise VagabondError::InvalidAction.new(@action)
       end
     end
 
@@ -75,9 +102,9 @@ module Vagabond
           class << self
             attr_accessor :ui
           end
+          attr_accessor :vagabondfile, :internal_config, :name, :ui
         end
       end
     end
-    
   end
 end

data/lib/vagabond/internal_configuration.rb

@@ -2,6 +2,7 @@ require 'digest/sha2'
 require 'json'
 require 'vagabond/helpers'
 require 'vagabond/constants'
+require 'chef/mixin/deep_merge'
 
 module Vagabond
   class InternalConfiguration
@@ -23,17 +24,36 @@ module Vagabond
       @config = Mash.new(
         :mappings => Mash.new,
         :template_mappings => Mash.new,
-        :test_mappings => Mash.new
+        :test_mappings => Mash.new,
+        :spec_mappings => Mash.new,
+        :spec_clusters => Mash.new
       ).merge(config)
       @force_bases = args[:force_bases] || []
       ensure_state
+      make_knife_config_if_required
     end
 
     def ensure_state
-      store_checksums
-      write_dna_json
-      write_solo_rb
-      run_solo if solo_needed?
+      check_bases_and_customs!
+      if(solo_needed?)
+        store_checksums
+        write_dna_json
+        write_solo_rb
+        run_solo if solo_needed?
+      end
+    end
+
+    def check_bases_and_customs!
+      if(File.exists?(dna_path))
+        dna = Mash.new(JSON.load(File.read(dna_path)))
+        %w(bases customs).each do |key|
+          if(dna[:vagabond][key])
+            dna[:vagabond][key].each do |n, opts|
+              options[:force_solo] = true unless Lxc.new(n).exists?
+            end
+          end
+        end
+      end
     end
 
     def [](k)
@@ -48,24 +68,33 @@ module Vagabond
       FileUtils.mkdir_p(store_path)
     end
 
-    def load_existing
+    def load_existing(file=nil)
       if(File.exists?(path = File.join(store_path, 'vagabond.json')))
-        @config = Mash.new(
-          JSON.load(
-            File.read(path)
+        if(file)
+          file.rewind
+          content = file.read
+        else
+          content = File.read(path)
+        end
+        if(content.strip.empty?)
+          config = Mash.new
+        else
+          config = Mash.new(
+            JSON.load(content)
           )
-        )
+        end
+        @config = Chef::Mixin::DeepMerge.merge(config, @config)
       else
         @config = Mash.new
       end
     end
 
     def store_path
-      FileUtils.mkdir_p(
-        File.join(
-          File.dirname(@vagabondfile.path), '.vagabond'
-        )
-      )
+      path = File.join(File.dirname(@vagabondfile.store_path), '.vagabond')
+      unless(File.directory?(path))
+        FileUtils.mkdir_p(path)
+      end
+      path
     end
 
     def dna_path
@@ -90,9 +119,9 @@ module Vagabond
           conf[:customs][generated_name(t_name)] = opts
           config[:template_mappings][t_name] = generated_name(t_name)
         else
-          ui.fatal "Invalid base template encountered: #{t}"
+          ui.fatal "Invalid base template encountered: #{t_name}"
           ui.info ui.color("  -> Valid base templates: #{BASE_TEMPLATES.sort.join(', ')}", :red)
-          exit EXIT_CODES[:invalid_base_template]
+          raise VagabondError::InvalidBaseTemplate.new(t_name)
         end
       end
       File.open(dna_path, 'w') do |file|
@@ -156,21 +185,85 @@ module Vagabond
     end
     
     def run_solo
-      ui.info ui.color('Ensuring expected system state (creating required base containers)', :yellow)
-      ui.info ui.color('   - This can take a while...', :yellow)
-      com = "#{options[:sudo]}chef-solo -j #{File.join(store_path, 'dna.json')} -c #{File.join(store_path, 'solo.rb')}"
-      debug(com)
-      cmd = Mixlib::ShellOut.new(com, :timeout => 12000, :live_stream => options[:debug])
-      cmd.run_command
-      cmd.error!
-      ui.info ui.color('  -> COMPLETE!', :yellow)
+      begin
+        ui.info ui.color('Ensuring expected system state (creating required base containers)', :yellow)
+        ui.info ui.color('   - This can take a while on first run or new templates...', :yellow)
+        com = "#{options[:sudo]}chef-solo -j #{File.join(store_path, 'dna.json')} -c #{File.join(store_path, 'solo.rb')}"
+        debug(com)
+        cmd = Mixlib::ShellOut.new(com, :timeout => 12000, :live_stream => options[:debug])
+        cmd.run_command
+        cmd.error!
+        ui.info ui.color('  -> COMPLETE!', :yellow)
+      rescue => e
+        ui.info e.to_s
+        FileUtils.rm(solo_path)
+        ui.info ui.color('  -> FAILED!', :red, :bold)
+        raise VagabondError::HostProvisionFailed.new(e)
+      end
+    end
+
+    def config_path
+      File.join(store_path, 'vagabond.json')
     end
     
     def save
-      File.open(File.join(store_path, 'vagabond.json'), 'w') do |file|
-        file.write(JSON.dump(@config))
+      mode = File.exists?(config_path) ? 'r+' : 'w+'
+      File.open(config_path, mode) do |file|
+        file.flock(File::LOCK_EX)
+        file.rewind
+        if(sha = file_changed?(file.path))
+          @checksums[file.path] = sha
+          load_existing(file)
+        end
+        file.rewind
+        file.write(JSON.pretty_generate(@config))
+        file.truncate(file.pos)
       end
     end
 
+    def knife_config_available?
+      if(File.exists?(File.join(store_path, 'knife.rb')))
+        false
+      else
+        cwd = @vagabondfile.directory.split('/')
+        found = false
+        until(found || cwd.empty?)
+          found = File.exists?(File.join(*(cwd + ['.chef/knife.rb'])))
+          cwd.pop
+        end
+        found
+      end
+    end
+
+    def file_changed?(path)
+      checksum = get_checksum(path)
+      checksum unless @checksums[path] == checksum
+     end
+    
+    def make_knife_config_if_required(force=false)
+      if((@vagabondfile[:local_chef_server] && @vagabondfile[:local_chef_server][:enabled]) || force)
+        unless(knife_config_available?)
+          store_dir = File.dirname(store_path)
+          k_dir = File.join(store_dir, '.chef')
+          FileUtils.mkdir_p(k_dir)
+          unless(File.exists?(knife = File.join(k_dir, 'knife.rb')))
+            File.open(knife, 'w') do |file|
+              file.write <<-EOF
+node_name 'dummy'
+client_key File.join(File.dirname(__FILE__), 'client.pem')
+validation_client_name 'dummy-validator'
+validation_key File.join(File.dirname(__FILE__), 'validation.pem')
+cookbook_path ['#{%w(cookbooks site-cookbooks).map{|dir|File.join(@vagabondfile.directory, dir)}.join(',')}']
+EOF
+            end
+          end
+          %w(client.pem validation.pem).each do |name|
+            unless(File.exists?(pem = File.join(k_dir, name)))
+              %x{openssl genrsa -out #{pem} 2048}
+            end
+          end
+        end
+      end
+    end
   end
 end