vagabond 0.2.8 → 0.2.10

data/lib/vagabond/actions/create.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'elecksee/ephemeral'
 
 module Vagabond
@@ -6,13 +7,14 @@ module Vagabond
       def _create
         name_required!
         if(lxc.exists?)
-          ui.warn "Node already exists: #{name}" unless name == 'server'
-          _start
+          ui.warn "Node already exists: #{name}"
+          add_link(:start)
         else
           ui.info "#{ui.color('Vagabond:', :bold)} Creating #{ui.color(name, :green)}"
           do_create
           ui.info ui.color('  -> CREATED!', :green)
         end
+        true
       end
 
       private
@@ -21,7 +23,7 @@ module Vagabond
         tmpl = config[:template]
         if(internal_config[:template_mappings].keys.include?(tmpl))
           tmpl = internal_config[:template_mappings][tmpl]
-        elsif(!BASE_TEMPLATES.include?(tmpl))
+        elsif(!Vagabond::BASE_TEMPLATES.include?(tmpl))
           ui.fatal "Template requested for node does not exist: #{tmpl}"
           raise VagabondError::InvalidTemplate.new(tmpl)
         end
@@ -32,11 +34,12 @@ module Vagabond
         config[:original] = tmpl
         config[:bind] = File.expand_path(vagabondfile.store_directory)
         ephemeral = Lxc::Ephemeral.new(config)
-        ephemeral.start!(:fork)
         e_name = ephemeral.name
         @internal_config[mappings_key][name] = e_name
         @internal_config.save
+        ephemeral.start!(:fork)
         @lxc = Lxc.new(e_name)
+        @lxc.wait_for_state(:running)
       end
 
     end

data/lib/vagabond/actions/destroy.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module Destroy
@@ -25,28 +26,37 @@ module Vagabond
       
       def _destroy
         name_required!
+        @destroyed ||= []
         if(options[:cluster])
-          nodes = vagabondfile[:clusters][name] if vagabondfile[:clusters]
-          if(nodes)
+          @cluster_name = name
+          @to_destroy = vagabondfile[:clusters][name] if vagabondfile[:clusters]
+          if(@to_destroy)
             ui.info "#{ui.color('Vagabond:', :bold)} Destroying cluster - #{ui.color(name, :red)}"
           else
             ui.error "Cluster name provided does not exist: #{name}"
-            nodes = []
+            @to_destroy = []
           end
         else
-          nodes = [name, @leftover_args].flatten.compact
+          @to_destroy = [name, @leftover_args].flatten.compact
         end
-        nodes.each do |n|
-          next unless n.is_a?(String)
-          @name = n
-          load_configurations
-          if(lxc.exists?)
-            ui.info "#{ui.color('Vagabond:', :bold)} Destroying node: #{ui.color(name, :red)}"
-            do_destroy
-            ui.info ui.color('  -> DESTROYED', :red)
-          else
-            ui.error "Node not created: #{name}"
+        remain = @to_destroy - @destroyed
+        @name = remain.shift
+        configure(:allow_missing)
+        if(lxc.exists?)
+          ui.info "#{ui.color('Vagabond:', :bold)} Destroying node: #{ui.color(name, :red)}"
+          do_destroy
+          ui.info ui.color('  -> DESTROYED', :red)
+        else
+          ui.error "Node not created: #{name}"
+        end
+        @destroyed << @name
+        if(@destroyed.size == @to_destroy.size)
+          if(@cluster_name)
+            @name = @cluster_name
+            configure
           end
+        else
+          add_link(:destroy)
         end
       end
 

data/lib/vagabond/actions/freeze.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module Freeze

data/lib/vagabond/actions/init.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module Init
@@ -20,16 +21,9 @@ module Vagabond
       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'
-          )
-        )
+        node = internal_config.cookbook_attributes(:vagabond)
         nodes = {}
-        node[:vagabond][:bases].keys.each do |template|
+        node[:bases].keys.each do |template|
           answer = nil
           until(%w(n y).include?(answer))
             answer = ui.ask_question("Include template: #{template} ", :default => 'y').downcase
@@ -45,9 +39,12 @@ module Vagabond
           end
         end
         {
+          :defaults => {
+            :template => 'ubuntu_1204'
+          },
           :nodes => nodes,
           :clusters => {},
-          :local_chef_server => {
+          :server => {
             :zero => false,
             :berkshelf => false,
             :librarian => false,
@@ -57,7 +54,7 @@ module Vagabond
           :sudo => true
         }
       end
-        
+
       def do_init
         if(File.exists?(vagabondfile.path))
           ui.confirm('Overwrite existing Vagabondfile', true)

data/lib/vagabond/actions/provision.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module Provision
@@ -13,23 +14,30 @@ module Vagabond
           ui.error "Node not created: #{name}"
         end
       end
-      
+
       private
 
       def do_provision
         ui.info "#{ui.color('Vagabond:', :bold)} Provisioning node: #{ui.color(name, :magenta)}"
-        com = "#{sudo} knife bootstrap #{lxc.container_ip(10, true)} -d chef-full -N #{name} -i /opt/hw-lxc-config/id_rsa "
-        com << "--no-host-key-verify --run-list \"#{config[:run_list].join(',')}\" "
+        com = ["bootstrap #{lxc.container_ip(10, true)} -N #{name} -i #{Settings[:ssh_key]}"]
+        com << "--no-host-key-verify --run-list \"#{config[:run_list].join(',')}\""
         if(config[:environment])
           com << "-E #{config[:environment]}"
         end
-        if(options[:knife_opts])
-          com << options[:knife_opts]
+        if(config[:no_lazy_load])
+          no_lazy_load_bootstrap = File.join(File.dirname(__FILE__), '..', 'bootstraps/no_lazy_load.erb')
+          com << "--template-file #{no_lazy_load_bootstrap}"
+        end
+        if(config[:chef_10])
+          chef_10_bootstrap = File.join(File.dirname(__FILE__), '..', 'bootstraps/chef_10_compat_config.erb')
+          com << "--template-file #{chef_10_bootstrap}"
+        end
+        if(attributes)
+          com << "-j '#{attributes}'"
         end
-        debug(com)
+        cmd = knife_command(com.join(' '), :live_stream => STDOUT, :timeout => 2000)
         # Send the live stream out since people will generally want to
         # know what's happening
-        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
         # TODO: This isn't really the best check, but should be good
@@ -39,7 +47,7 @@ module Vagabond
           true
         else
           ui.info ui.color('  -> PROVISION FAILED', :red)
-          false
+          raise VagabondError::NodeProvisionFailed.new("Failed to provision: #{name}")
         end
       end
 

data/lib/vagabond/actions/rebuild.rb

@@ -1,18 +1,13 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module Rebuild
       def _rebuild
         name_required!
         ui.info "#{ui.color('Vagabond:', :bold)} Rebuilding #{ui.color(name, :blue)}"
-        _destroy
-        @lxc = Lxc.new(name)
-        _destroy
-        options[:force_solo] = true
-        ui.info ui.color('  -> DESTROYED!', :red)
-        internal_config.run_solo
-        internal_config[mappings_key].delete(name)
-        internal_config.save
-        ui.info ui.color('  -> REBUILT!', :green)
+        add_link(:destroy)
+        options[:auto_provision] = true
+        add_link(:up)
       end
     end
   end

data/lib/vagabond/actions/ssh.rb

@@ -1,12 +1,19 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module SSH
+
       def _ssh
         name_required!
         if(lxc.exists?)
           if(lxc.running?)
+            key_path = setup_key!
             ui.info "#{ui.color('Vagabond:', :bold)} SSH connect to: #{ui.color(name, :cyan)}"
-            exec("#{options[:sudo]}ssh root@#{lxc.container_ip(10, true)} -i /opt/hw-lxc-config/id_rsa -oStrictHostKeyChecking=no")
+            command = ["#{options[:sudo]}ssh root@#{lxc.container_ip(10, true)} -i #{Settings[:ssh_key]} -oStrictHostKeyChecking=no"]
+            if(@leftover_args)
+              command << "\"#{@leftover_args.join(' ')}\""
+            end
+            exec command.join(' ')
           else
             ui.error "Node not running: #{name}"
           end
@@ -14,6 +21,7 @@ module Vagabond
           ui.error "Node not created: #{name}"
         end
       end
+
     end
   end
 end

data/lib/vagabond/actions/start.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module Start

data/lib/vagabond/actions/status.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module Status

data/lib/vagabond/actions/thaw.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module Thaw

data/lib/vagabond/actions/up.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   module Actions
     module Up
@@ -17,7 +18,7 @@ module Vagabond
         name_required!
         if(lxc.exists?)
           if(lxc.running?)
-            ui.error "Node already exists and is running: #{name}"
+            ui.warn "Node already exists and is running: #{name}"
           else
             ui.info "#{ui.color('Vagabond:', :bold)} Starting node: #{ui.color(name, :green)}"
             lxc.start
@@ -25,14 +26,28 @@ module Vagabond
           end
         end
         if(options[:parallel])
+          # TODO: Need strategy for chains
           @threads[:up] ||= []
-          @threads[:up] << Thread.new do
-            _create
-            do_provision if options[:auto_provision]
-          end
+          t_holder = Mash.new
+          @threads[:up] << t_holder.update(
+            :thread => Thread.new{
+              sleep(0.01)
+              _create
+              begin
+                do_provision if options[:auto_provision]
+                t_holder[:result] = true
+              rescue => e
+                t_holder[:result] = false
+              end
+            }
+          )
         else
-          _create
-          do_provision if options[:auto_provision]
+          if(!lxc.exists?)
+            add_link(:create)
+          elsif(!lxc.running?)
+            add_link(:start)
+          end
+          add_link(:provision) if options[:auto_provision]
         end
       end
 

data/lib/vagabond/bootstraps/chef_10_compat_config.erb

@@ -0,0 +1,62 @@
+bash -c '
+<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+
+exists() {
+  if command -v $1 &>/dev/null
+  then
+    return 0
+  else
+    return 1
+  fi
+}
+
+install_sh="https://www.opscode.com/chef/install.sh"
+version_string="-v <%= chef_version %>"
+
+if ! exists /usr/bin/chef-client; then
+  if exists wget; then
+    bash <(wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %> ${install_sh} -O -) ${version_string}
+  elif exists curl; then
+    bash <(curl -L <%= "--proxy \"#{knife_config[:bootstrap_proxy]}\" " if knife_config[:bootstrap_proxy] %> ${install_sh}) ${version_string}
+  else
+    echo "Neither wget nor curl found. Please install one and try again." >&2
+    exit 1
+  fi
+fi
+
+mkdir -p /etc/chef
+
+cat > /etc/chef/validation.pem <<'EOP'
+<%= validation_key %>
+EOP
+chmod 0600 /etc/chef/validation.pem
+
+<% begin %>
+<% if encrypted_data_bag_secret -%>
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+chmod 0600 /etc/chef/encrypted_data_bag_secret
+<% end -%>
+<% rescue; end %>
+
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir -p /etc/chef/ohai/hints
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
+<%= hash.to_json %>
+EOP
+<% end -%>
+<% end -%>
+
+cat > /etc/chef/client.rb <<'EOP'
+<%= config_content.sub(':auto', ':info') %>
+EOP
+
+cat > /etc/chef/first-boot.json <<'EOP'
+<%= first_boot.to_json %>
+EOP
+
+<%= start_chef %>'

data/lib/vagabond/bootstraps/no_lazy_load.erb

@@ -0,0 +1,63 @@
+bash -c '
+<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+
+exists() {
+  if command -v $1 &>/dev/null
+  then
+    return 0
+  else
+    return 1
+  fi
+}
+
+install_sh="https://www.opscode.com/chef/install.sh"
+version_string="-v <%= chef_version %>"
+
+if ! exists /usr/bin/chef-client; then
+  if exists wget; then
+    bash <(wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %> ${install_sh} -O -) ${version_string}
+  elif exists curl; then
+    bash <(curl -L <%= "--proxy \"#{knife_config[:bootstrap_proxy]}\" " if knife_config[:bootstrap_proxy] %> ${install_sh}) ${version_string}
+  else
+    echo "Neither wget nor curl found. Please install one and try again." >&2
+    exit 1
+  fi
+fi
+
+mkdir -p /etc/chef
+
+cat > /etc/chef/validation.pem <<'EOP'
+<%= validation_key %>
+EOP
+chmod 0600 /etc/chef/validation.pem
+
+<% begin %>
+<% if encrypted_data_bag_secret -%>
+cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+chmod 0600 /etc/chef/encrypted_data_bag_secret
+<% end -%>
+<% rescue; end %>
+
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir -p /etc/chef/ohai/hints
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
+<%= hash.to_json %>
+EOP
+<% end -%>
+<% end -%>
+
+cat > /etc/chef/client.rb <<'EOP'
+<%= config_content.sub(':auto', ':info') %>
+Chef::Config[:no_lazy_load] = true
+EOP
+
+cat > /etc/chef/first-boot.json <<'EOP'
+<%= first_boot.to_json %>
+EOP
+
+<%= start_chef %>'