vagabond 0.2.8 → 0.2.10

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

@@ -1,12 +1,5 @@
 bash -c '
 
-apt-get install -y -q wget
-
-mkdir -p /var/chef/cookbooks/vagabond
-mkdir -p /var/chef/cookbooks/lxc
-wget --no-check-certificate -qO- https://github.com/chrisroberts/chef-vagabond/tarball/master | tar xvzC /var/chef/cookbooks/vagabond --strip-components=1
-wget --no-check-certificate -qO- https://github.com/hw-cookbooks/lxc/tarball/master | tar xvzC /var/chef/cookbooks/lxc --strip-components=1
-
 (
 echo "
 {
@@ -15,6 +8,6 @@ echo "
 "
 ) > /tmp/chef-server.json
 
-chef-solo -j /tmp/chef-server.json
+chef-solo -j /tmp/chef-server.json -c /etc/chef-solo-host.rb
 
 '

data/lib/vagabond/bootstraps/server.erb

@@ -1,8 +1,4 @@
 bash -c '
-apt-get install -y -q wget
-mkdir -p /var/chef/cache /var/chef/cookbooks/chef-server /var/chef/cookbooks/chef-server-populator
-wget --no-check-certificate -qO- https://github.com/opscode-cookbooks/chef-server/archive/master.tar.gz | tar xvzC /var/chef/cookbooks/chef-server --strip-components=1
-wget --no-check-certificate -qO- https://github.com/hw-cookbooks/chef-server-populator/tarball/master | tar xvzC /var/chef/cookbooks/chef-server-populator --strip-components=1
 
 mkdir -p /tmp/chef-server-setup
 (
@@ -25,6 +21,13 @@ mkdir -p /etc/chef
 cp /tmp/chef-server-setup/validation.pem /etc/chef/validation.pem
 chmod 600 /etc/chef/validation.pem
 
+chef-server-ctl stop
+chef-server-ctl uninstall
+rm -rf ~/*
+rm -rf /opt/chef-server
+rm -rf /var/opt/chef-server
+dpkg -i /var/chef-host/chef-server*
+
 IPADDR=`ip addr show eth0 | grep "inet " | awk -F" " '\''{print $2}'\'' | sed -e "s/\/24//"`
 (
 echo "
@@ -44,7 +47,7 @@ echo "
       \"<%= Chef::Config[:node_name] %>\": \"client_key_pub.pem\",
       \"<%= Chef::Config[:validation_client_name] %>\": \"validation_pub.pem\"
     },
-    \"servername_override\": \"${IPADDR}\",
+    \"endpoint\": \"${IPADDR}\",
     \"base_path\": \"/tmp/chef-server-setup\"
   },
   \"run_list\": [ \"recipe[chef-server-populator::solo]\", \"recipe[chef-server]\" ]
@@ -52,7 +55,7 @@ echo "
 "
 ) > /tmp/chef-server.json
 
-chef-solo -j /tmp/chef-server.json
+chef-solo -j /tmp/chef-server.json -c /etc/chef-solo-host.rb
 
 rm -rf /tmp/chef-server-setup
 

data/lib/vagabond/constants.rb

@@ -1,12 +1,7 @@
+#encoding: utf-8
 require 'chef/mash'
 
 module Vagabond
-  BASE_TEMPLATES = File.readlines(
-    File.join(File.dirname(__FILE__), 'cookbooks/vagabond/attributes/default.rb')
-  ).map do |l|
-    l.scan(%r{bases\]\[:([^\]]+)\]}).flatten.first
-  end.compact.uniq
-
   COLORS = Mash.new(
     :success => :green,
     :create => :green,

data/lib/vagabond/core.rb

@@ -0,0 +1,209 @@
+#encoding: utf-8
+
+require 'thor'
+require 'chef/knife/core/ui'
+require 'vagabond/uploader'
+require 'elecksee/lxc'
+
+%w(constants errors vagabondfile internal_configuration helpers).each do |dep|
+  require "vagabond/#{dep}"
+end
+
+module Vagabond
+  class Core
+
+    DISABLE_HOST_SOLO_ON = %w(status init)
+    
+    include Thor::Actions
+    include Helpers
+
+    Actions.constants.each do |const|
+      klass = Actions.const_get(const)
+      include klass if klass.is_a?(Module)
+    end
+    
+    attr_accessor :mappings_key
+    attr_accessor :lxc
+    attr_accessor :config
+    attr_accessor :action
+
+    CLI_OPTIONS = lambda do
+      class_option(:debug,
+        :type => :boolean,
+        :default => false
+      )
+
+      class_option(:force_solo,
+        :aliases => '--force-configure',
+        :type => :boolean,
+        :default => false,
+        :desc => 'Force configuration of system'
+      )
+
+      class_option(:color,
+        :type => :boolean,
+        :default => true,
+        :desc => 'Enable/disable colorized output'
+      )
+
+      class_option(:vagabond_file,
+        :aliases => '-f',
+        :type => :string,
+        :desc => 'Provide path to Vagabondfile'
+      )
+      
+      class_option(:local_server,
+        :type => :boolean,
+        :default => true,
+        :desc => 'Enable/disable local Chef server usage if available'
+      )
+
+      class_option(:callbacks,
+        :type => :boolean,
+        :default => true,
+        :desc => 'Enable/disable action callbacks'
+      )
+    end
+
+    CLI_OPTIONS.call
+
+    # action:: Action to perform
+    # name:: Name of vagabond
+    # config:: Hash configuration
+    #
+    # Creates an instance    
+    def initialize(*args)
+      super
+      @threads = Mash.new
+      @mappings_key = :mappings
+    end
+
+    ## COMMANDS
+
+    COMMANDS = lambda do |show_node=true|
+      Actions.constants.find_all do |const|
+        Actions.const_get(const).is_a?(Module)
+      end.map(&:to_s).map(&:downcase).each do |meth|
+        if(self.respond_to?("_#{meth}_desc"))
+          args = self.send("_#{meth}_desc")
+        else
+          args = ["#{meth}#{' NODE' if show_node}", "#{meth.capitalize} instance#{' of NODE' if show_node}"]
+        end
+        desc(*args)
+        if(self.respond_to?("_#{meth}_options"))
+          self.send("_#{meth}_options").each do |opts|
+            method_option(*opts)
+          end
+        end
+        define_method meth do |*args|
+          @original_args = args.dup
+          unless(args.include?(:no_setup))
+            setup(meth, *args)
+          end
+          result = execute
+          callbacks(meth)
+          chain!
+          result
+        end
+      end
+    end
+
+    COMMANDS.call
+
+    protected
+
+    def attributes
+      if(config[:attributes])
+        if(config[:attributes].is_a?(Hash))
+          JSON.dump(config[:attributes])
+        else
+          config[:attributes].to_s
+        end
+      end
+    end
+    
+    def version
+      setup_ui
+      ui.info "#{ui.color('Vagabond:', :yellow, :bold)} - Advocating idleness and work-shyness"
+      ui.info "  #{ui.color('Version:', :blue)} - #{VERSION.version} (#{VERSION.codename})"
+      exit
+    end
+    
+    def execute
+      self.send("_#{action}")
+    end
+    
+    def setup(action, name=nil, *args)
+      @action = action
+      @name = name
+      hash_args = args.detect{|x|x.is_a?(Hash)}
+      if(hash_args)
+        args.delete(hash_args)
+        _ui = hash_args.delete(:ui)
+        base_setup(_ui)
+        config.merge!(hash_args)
+      else
+        base_setup
+      end
+      @leftover_args = args
+    end
+
+    def name_required!
+      unless(name)
+        ui.fatal "Node name is required!"
+        raise VagabondError::MissingNodeName.new
+      end
+    end
+
+    def provision_solo(dir)
+      ui.info "#{ui.color('Vagabond:', :bold)} Provisioning node: #{ui.color(name, :magenta)}"
+      lxc.container_ip(20) # force wait for container to appear and do so quietly
+      cmd = direct_container_command(
+        "chef-solo -c #{File.join(dir, 'solo.rb')} -j #{File.join(dir, 'dna.json')}",
+        :live_stream => STDOUT
+      )
+      raise VagabondError::NodeProvisionFailed.new("Failed to provision: #{name}") unless cmd
+    end
+    
+    def validate!
+      if(name.to_s == 'server')
+        ui.fatal "RESERVED node name supplied: #{ui.color(name, :red)}"
+        ui.info ui.color("  -> Try: vagabond server #{action}", :cyan)
+        raise VagabondError::ReservedName.new(name)
+      end
+      if(name && config.nil? && !options[:disable_name_validate])
+        ui.fatal "Invalid node name supplied: #{ui.color(name, :red)}"
+        ui.info ui.color("  -> Available: #{vagabondfile[:nodes].keys.sort.join(', ')}", :cyan)
+        raise VagabondError::InvalidName.new(name)
+      end
+    end
+    
+    def check_existing!
+      if(lxc.exists?)
+        ui.error "LXC: #{name} already exists!"
+        true
+      end
+    end
+    
+    def base_dir
+      File.dirname(vagabondfile.path)
+    end
+
+    def vagabond_dir
+      File.join(base_dir, '.vagabond')
+    end
+
+    def wait_for_completion(type=nil)
+      @threads ||= []
+      if(type)
+        Array(@threads[type]).collect{|hsh| hsh[:thread]}.map(&:join)
+      else
+        @threads.values.flatten.collect{|hsh| hsh[:thread]}.map(&:join)
+      end
+    end
+
+    def tasks(type=nil)
+      type ? @threads[type] : @threads
+    end
+  end
+end

data/lib/vagabond/errors.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   class VagabondError < StandardError
     class << self
@@ -15,6 +16,8 @@ module Vagabond
         kitchen_no_cookbook_args kitchen_too_many_args
         kitchen_invalid_platform missing_node_name cluster_invalid
         kitchen_test_failed host_provision_failed spec_failed
+        node_provision_failed librarian_host_install_failed
+        echef_base_missing
     ).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")

data/lib/vagabond/helpers.rb

@@ -1,110 +1,22 @@
+#encoding: utf-8
 require 'vagabond/constants'
-require 'tmpdir'
-require 'uuidtools'
+
+Dir.glob(File.join(File.dirname(__FILE__), 'helpers/*.rb')).each do |path|
+  require "vagabond/helpers/#{File.basename(path).sub('.rb', '')}"
+end
 
 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 FalseClass
-        ''
-      when String
-        "#{vagabondfile[:sudo]} "
-      else
-        'sudo '
-      end
-    end
-
-    def debug(s)
-      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
-        @_gn[n] = "#{n}-"
-        GEN_NAME_LENGTH.times do
-          @_gn[n] << RAND_CHARS[rand(RAND_CHARS.size)]
-        end
-      end
-      @_gn[n]
-    end
-
-    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 = args.first
-      end
-      options[:debug] = STDOUT if options[:debug]
-      self.class.ui = @ui unless args.include?(:no_class_set)
-      @ui
-    end
-
-    def execute
-      if(public_methods.include?(@action.to_sym))
-        send(@action)
-      else
-        ui.error "Invalid action received: #{@action}"
-        raise VagabondError::InvalidAction.new(@action)
-      end
-    end
-
-    def generate_hash
-      Digest::MD5.hexdigest(@vagabondfile.path)
-    end
-
-    def direct_container_command(command, args={})
-      _lxc = args[:lxc] || lxc
-      com = "#{sudo}ssh root@#{lxc.container_ip} -i /opt/hw-lxc-config/id_rsa -oStrictHostKeyChecking=no '#{command}'"
-      debug(com)
-      begin
-        cmd = Mixlib::ShellOut.new(com,
-          :live_stream => args[:live_stream] || options[:debug],
-          :timeout => args[:timeout] || 1200
-        )
-        cmd.run_command
-        cmd.error!
-        true
-      rescue
-        raise if args[:raise_on_failure]
-        false
-      end
-    end
-
     class << self
+      
       def included(klass)
-        klass.class_eval do
-          class << self
-            attr_accessor :ui
-          end
-          attr_accessor :vagabondfile, :internal_config, :name, :ui
+        ::Vagabond::Helpers.constants.each do |konst|
+          const = ::Vagabond::Helpers.const_get(konst)
+          next unless const.is_a?(Module)
+          klass.send(:include, const)
         end
       end
+      
     end
   end
 end

data/lib/vagabond/helpers/base.rb

@@ -0,0 +1,134 @@
+#encoding: utf-8
+
+require 'vagabond/constants'
+require 'etc'
+
+module Vagabond
+  module Helpers
+
+    module Base
+
+      SSH_KEY_BASE = '/opt/hw-lxc-config/id_rsa'
+
+      def base_setup(*args)
+        @options = Mash.new(@options.dup)
+        @vagabondfile = Vagabondfile.new(options[:vagabond_file], :allow_missing)
+        Lxc.use_sudo = sudo
+        options[:sudo] = sudo
+        setup_ui(*args)
+        config_args = args.detect{|i| i.is_a?(Hash) && i[:config]} || {}
+        @internal_config = InternalConfiguration.new(@vagabondfile, ui, options, config_args[:config] || {})
+        configure(:allow_missing) unless args.include?(:no_configure)
+        validate_if_required unless args.include?(:no_validate)
+        Chef::Log.init('/dev/null') unless options[:debug]
+        Settings[:ssh_key] = setup_key!
+      end
+
+      def setup_key!
+        path = "/tmp/.#{ENV['USER']}_id_rsa"
+        unless(File.exists?(path))
+          [
+            "cp #{SSH_KEY_BASE} #{path}",
+            "chown #{ENV['USER']} #{path}",
+            "chmod 600 #{path}"
+          ].each do |com|
+            cmd = build_command(com, :sudo => true)
+            cmd.run_command
+            cmd.error!
+          end
+        end
+        path
+      end
+
+      def configure(*args)
+        @config ||= Mash.new
+        @config.merge!(vagabondfile.for_node(name, *args))
+        @lxc = Lxc.new(internal_config[mappings_key][name] || '____nonreal____')
+        if(options[:local_server] && vagabondfile.local_chef_server? && lxc_installed?)
+          proto = vagabondfile[:local_chef_server][:zero] ? 'http' : 'https'
+          srv_name = internal_config[:mappings][:server] || '____nonreal____'
+          srv = Lxc.new(srv_name)
+          if(srv.running?)
+            knife_config :server_url => "#{proto}://#{srv.container_ip(10, true)}"
+          else
+            unless(action.to_s == 'status' || name.to_s =='server')
+              ui.warn 'Local chef server is not currently running!'
+            end
+          end
+        end
+      end
+
+      def validate_if_required
+        if(respond_to?(check = "#{action}_validate?".to_sym))
+          validate! if send(check)
+        else
+          validate!
+        end
+      end
+
+      def sudo
+        sudo_val = vagabondfile[:sudo]
+        if(sudo_val.nil? || sudo_val.to_s == 'smart')
+          if(ENV['rvm_bin_path'] && RbConfig::CONFIG['bindir'].include?(File.dirname(ENV['rvm_bin_path'])))
+            sudo_val = 'rvmsudo'
+          elsif(Etc.getpwuid.uid == 0)
+            sudo_val = false
+          else
+            sudo_val = true
+          end
+        end
+        case sudo_val
+        when FalseClass
+          ''
+        when String
+          "#{sudo_val} "
+        else
+          'sudo '
+        end
+      end
+
+      def debug(s)
+        ui.info "#{ui.color('DEBUG:', :red, :bold)} #{s}" if options[:debug] && ui
+      end
+
+      def setup_ui(*args)
+        unless(@ui)
+          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 = args.first
+          end
+          options[:debug] = STDOUT if options[:debug]
+          self.class.ui = @ui unless args.include?(:no_class_set)
+        end
+        @ui
+      end
+
+      def execute
+        if(public_methods.include?(@action.to_sym))
+          send(@action)
+        else
+          ui.error "Invalid action received: #{@action}"
+          raise VagabondError::InvalidAction.new(@action)
+        end
+      end
+
+      def lxc_installed?
+        system('which lxc-info > /dev/null')
+      end
+
+      class << self
+        def included(klass)
+          klass.class_eval do
+            class << self
+              attr_accessor :ui
+            end
+            attr_accessor :vagabondfile, :internal_config, :name, :ui, :options, :leftover_args
+          end
+        end
+      end
+
+    end
+  end
+end