vagabond 0.1.0 → 0.1.2

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

@@ -1,16 +1,43 @@
+include_recipe 'lxc::install_dependencies'
+
+cookbook_file '/usr/share/lxc/templates/lxc-centos' do
+  source 'lxc-centos'
+  mode 0755
+end
 
 node[:vagabond][:bases].each do |name, options|
+  
+  next unless options[:enabled]
+
+  pkg_coms = [
+    'update -y -q',
+    'upgrade -y -q',
+    'install curl -y -q'
+  ]
+  if(%w(debian ubuntu).include?(options[:template]))
+    pkg_man = 'apt-get'
+  elsif(%w(fedora centos).include?(options[:template]))
+    pkg_man = 'yum'
+  end
+  if(pkg_man)
+    pkg_coms.map! do |c|
+      "#{pkg_man} #{c}"
+    end
+  else
+    pkg_coms = []
+  end
 
   lxc_container name do
     template options[:template]
     template_opts options[:template_options]
     default_config false if options[:memory]
+    create_environment options[:environment] if options[:environment]
     initialize_commands [
       'rm -f /etc/sysctl.d/10-console-messages.conf',
       'rm -f /etc/sysctl.d/10-ptrace.conf',
-      'rm -f /etc/sysctl.d/10-kernel-hardening.conf',
-      'apt-get install -q -y curl',
-      'curl -L https://www.opscode.com/chef/install.sh | sudo bash'
+      'rm -f /etc/sysctl.d/10-kernel-hardening.conf'
+    ] + pkg_coms + [
+      'curl -L https://www.opscode.com/chef/install.sh | bash'
     ]
   end
 

data/lib/vagabond/helpers.rb

@@ -0,0 +1,18 @@
+module Vagabond
+  module Helpers
+    private
+    def sudo
+      case @vagabondfile[:sudo]
+      when TrueClass
+        'sudo '
+      when String
+        "#{@vagabondfile[:sudo]} "
+      end
+    end
+
+    def debug(s)
+      ui.info "#{ui.color('DEBUG:', :red, :bold)} #{s}" if Config[:debug]
+    end
+    
+  end
+end

data/lib/vagabond/internal_configuration.rb

@@ -1,8 +1,11 @@
 require 'digest/sha2'
+require 'vagabond/helpers'
 
 module Vagabond
   class InternalConfiguration
 
+    include Helpers
+    
     attr_reader :config
     attr_reader :ui
     
@@ -58,21 +61,21 @@ module Vagabond
     end
 
     def write_dna_json
-      templates = @v_config.config[:boxes].map(&:last).map{|i| i[:template]}.compact.uniq
-      templates = Hash[*(
-          templates.map do |t|
-            if(@v_config.config[:templates] && @v_config[:templates][t])
-              [t, @v_config.config[:templates][t]]
-            else
-              [t, nil]
-            end
-          end
-      ).flatten]
+      conf = Mash.new
+      @v_config.config[:boxes].map(&:last).map{|i| i[:template]}.compact.uniq.each do |t|
+        conf[t] = Mash.new(:enabled => true)
+      end
+      if(@v_config.config[:templates])
+        @v_config.config[:templates].each do |t|
+          conf[t] ||= Mash.new
+          conf[t].merge!(@v_config[:templates][t])
+        end
+      end
       File.open(dna_path, 'w') do |file|
         file.write(
           JSON.dump(
             :vagabond => {
-              :bases => templates
+              :bases => conf
             },
             :run_list => %w(recipe[vagabond])
           )
@@ -130,9 +133,11 @@ module Vagabond
     end
     
     def run_solo
-      ui.info 'Ensuring expected system state...'
+      ui.info ui.color('Ensuring expected system state (creating required template containers)', :yellow)
+      ui.info ui.color('   - This can take a while...', :yellow)
       com = "#{Config[:sudo]}chef-solo -j #{File.join(store_path, 'dna.json')} -c #{File.join(store_path, 'solo.rb')}"
-      cmd = Mixlib::ShellOut.new(com, :timeout => 1200)
+      debug(com)
+      cmd = Mixlib::ShellOut.new(com, :timeout => 1200, :live_stream => Config[:debug])
       cmd.run_command
       cmd.error!
     end

data/lib/vagabond/knife.rb

@@ -0,0 +1,36 @@
+require 'vagabond/helpers'
+
+module Vagabond
+  class Knife
+
+    include Helpers
+
+    attr_reader :name_args
+    
+    def initialize(name, name_args)
+      @name_args = name_args
+      @vagabondfile = Vagabondfile.new(Config[:vagabond_file])
+      Config[:disable_solo] = true
+      Config[:sudo] = sudo
+      Lxc.use_sudo = @vagabondfile[:sudo].nil? ? true : @vagabondfile[:sudo]
+      @internal_config = InternalConfiguration.new(@vagabondfile, nil)
+      unless(Config[:disable_local_server])
+        if(@vagabondfile[:local_chef_server] && @vagabondfile[:local_chef_server][:enabled])
+          srv = Lxc.new(@internal_config[:mappings][:server])
+          if(srv.running?)
+            Config[:knife_opts] = " -s https://#{srv.container_ip(10, true)}"
+          else
+            Config[:knife_opts] = ' -s https://no-local-server'
+          end
+        end
+      end
+
+    end
+
+    def execute
+      exec("knife #{name_args.join(' ')} #{Config[:knife_opts]}")
+    end
+
+    
+  end
+end

data/lib/vagabond/server.rb

@@ -12,120 +12,85 @@ module Vagabond
       @action = actions.shift
       setup_ui
       load_configurations
+      Config[:disable_auto_provision] = true
     end
     
-    def create
+    def stop
       if(lxc.exists?)
-        ui.warn 'Server container already exists'
-        if(lxc.frozen?)
-          ui.fatal 'Server container is currently frozen!'
-        elsif(lxc.stopped?)
-          lxc.start
-          ui.info 'Server container has been started'
+        if(lxc.running?)
+          ui.info 'Shutting down Chef server container...'
+          lxc.shutdown
+          ui.info 'Chef server container shut down!'
         else
-          ui.info 'Server container is currently running'
+          ui.error 'Chef server container not currently running'
         end
       else
-        ui.info 'Creating Chef server container...'
-        do_create
+        ui.error 'Chef server container has not been created'
       end
     end
 
-    def destroy
-      if(lxc.exists?)
-        ui.info 'Destroying Chef server container...'
-        do_destroy
-      else
-        ui.fatal 'No Chef server exists within this environment'
-      end
-    end
-
-    def do_create
-      cmd = Mixlib::ShellOut.new("#{Config[:sudo]}lxc-clone -n #{generated_name} -o #{@base_template}")
-      cmd.run_command
-      cmd.error!
-      @lxc = Lxc.new(generated_name)
-      @internal_config[:mappings][name] = generated_name
-      @internal_config.save
-      ui.info "Chef Server container created!"
-      lxc.start
-      ui.info "Bootstrapping erchef..."
-      tem_file = File.expand_path(File.join(File.dirname(__FILE__), 'bootstraps/server.erb'))
-      com = "#{Config[:sudo]}knife bootstrap #{lxc.container_ip(10, true)} --template-file #{tem_file} -i /opt/hw-lxc-config/id_rsa"
-      cmd = Mixlib::ShellOut.new(com, :live_stream => STDOUT, :timeout => 1200)
-      cmd.run_command
-      cmd.error!
-      ui.info 'Chef Server has been created!'
-      auto_upload if vagabondfile[:local_chef_server][:auto_upload]
-    end
-
     def auto_upload
       ui.info 'Auto uploading all assets to local Chef server...'
       upload_roles
       upload_databags
       upload_environments
       upload_cookbooks
-      ui.info 'All assets uploaded to local Chef server!'
+      ui.info ui.color('  -> All assets uploaded!', :green)
     end
 
     def upload_roles
-      ui.info "Uploading roles to local Chef server..."
-      com = "knife role from file #{File.join(base_dir, 'roles/*')} #{Config[:knife_opts]}"
-      cmd = Mixlib::ShellOut.new(com)
-      cmd.run_command
-      cmd.error!
-      ui.info "Roles uploaded to local Chef server!"
+      am_uploading('roles') do
+        com = "knife role from file #{File.join(base_dir, 'roles/*')} #{Config[:knife_opts]}"
+        debug(com)
+        cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+        cmd.run_command
+        cmd.error!
+      end
     end
 
     def upload_databags
-      ui.info "Uploading data bags to local Chef server..."
-      Dir.glob(File.join(base_dir, "data_bags/*")).each do |b|
-        next if %w(. ..).include?(b)
-        coms = [
-          "knife data bag create #{File.basename(b)} #{Config[:knife_opts]}",
-          "knife data bag from file #{File.basename(b)} #{Config[:knife_opts]} --all"
-        ].each do |com|
-          cmd = Mixlib::ShellOut.new(com)
-          cmd.run_command
-          cmd.error!
+      am_uploading('data bags') do
+        Dir.glob(File.join(base_dir, "data_bags/*")).each do |b|
+          next if %w(. ..).include?(b)
+          coms = [
+            "knife data bag create #{File.basename(b)} #{Config[:knife_opts]}",
+            "knife data bag from file #{File.basename(b)} #{Config[:knife_opts]} --all"
+          ].each do |com|
+            debug(com)
+            cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+            cmd.run_command
+            cmd.error!
+          end
         end
       end
-      ui.info "Data bags uploaded to local Chef server!"
     end
 
     def upload_environments
-      ui.info "Uploading environments to local Chef server..."
-      com = "knife environment from file #{File.join(base_dir, 'environments/*')} #{Config[:knife_opts]}"
-      cmd = Mixlib::ShellOut.new(com)
-      cmd.run_command
-      cmd.error!
-      ui.info "Environments uploaded to local Chef server!"
+      am_uploading('environments') do
+        com = "knife environment from file #{File.join(base_dir, 'environments/*')} #{Config[:knife_opts]}"
+        debug(com)
+        cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+        cmd.run_command
+        cmd.error!
+      end
     end
 
     def upload_cookbooks
-      ui.info "Uploading cookbooks to local Chef server..."
-      if(vagabondfile[:local_chef_server][:berkshelf])
-        berks_upload
-      else
-        raw_upload
+      am_uploading('cookbooks') do
+        if(vagabondfile[:local_chef_server][:berkshelf])
+          berks_upload
+        else
+          raw_upload
+        end
       end
     end
 
-    def berks_upload
-      write_berks_config
-      com = "berks upload -c #{File.join(vagabond_dir, 'berks.json')}"
-      cmd = Mixlib::ShellOut.new(com)
-      cmd.run_command
-      cmd.error!
-      ui.info "Berks cookbook upload complete!"
-    end
+    private
 
-    def raw_upload
-      com = "knife cookbook upload#{Config[:knife_opts]} --all"
-      cmd = Mixlib::ShellOut.new(com)
-      cmd.run_command
-      cmd.error!
-      ui.info "Cookbook upload complete!"
+    def am_uploading(thing)
+      ui.info "#{ui.color('Local chef server:', :bold)} Uploading #{ui.color(thing, :green)}"
+      yield
+      ui.info ui.color("  -> UPLOADED #{thing.upcase}", :green)
     end
 
     def write_berks_config
@@ -154,5 +119,47 @@ module Vagabond
       @_gn
     end
 
+    def do_create
+      com = "#{Config[:sudo]}lxc-clone -n #{generated_name} -o #{@base_template}"
+      debug(com)
+      cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+      cmd.run_command
+      cmd.error!
+      @lxc = Lxc.new(generated_name)
+      @internal_config[:mappings][name] = generated_name
+      @internal_config.save
+      ui.info ui.color('  -> Chef Server container created!', :cyan)
+      lxc.start
+      ui.info ui.color('  -> Bootstrapping erchef...', :cyan)
+      tem_file = File.expand_path(File.join(File.dirname(__FILE__), 'bootstraps/server.erb'))
+      com = "#{Config[:sudo]}knife bootstrap #{lxc.container_ip(10, true)} --template-file #{tem_file} -i /opt/hw-lxc-config/id_rsa"
+      debug(com)
+      cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug], :timeout => 1200)
+      cmd.run_command
+      cmd.error!
+      ui.info ui.color('  -> Chef Server CREATED!', :green)
+      Config[:knife_opts] = " --server-url https://#{lxc.container_ip(20, true)}"
+      auto_upload if vagabondfile[:local_chef_server][:auto_upload]
+    end
+
+    def berks_upload
+      write_berks_config
+      com = "berks upload -c #{File.join(vagabond_dir, 'berks.json')}"
+      debug(com)
+      cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+      cmd.run_command
+      cmd.error!
+      ui.info "Berks cookbook upload complete!"
+    end
+
+    def raw_upload
+      com = "knife cookbook upload#{Config[:knife_opts]} --all"
+      debug(com)
+      cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+      cmd.run_command
+      cmd.error!
+      ui.info "Cookbook upload complete!"
+    end
+
   end
 end

data/lib/vagabond/vagabond.rb

@@ -8,12 +8,15 @@ end
 
 require 'vagabond/vagabondfile'
 require 'vagabond/internal_configuration'
+require 'vagabond/helpers'
 require 'chef/knife/core/ui'
 require File.join(File.dirname(__FILE__), 'cookbooks/lxc/libraries/lxc.rb')
 
 module Vagabond
   class Vagabond
 
+    include Helpers
+
     class << self
       attr_accessor :ui
     end
@@ -55,29 +58,40 @@ module Vagabond
       unless(Config[:disable_local_server])
         if(@vagabondfile[:local_chef_server] && @vagabondfile[:local_chef_server][:enabled])
           srv = Lxc.new(@internal_config[:mappings][:server])
-          Config[:knife_opts] = " -s https://#{srv.container_ip(10, true)}"
+          if(srv.running?)
+            Config[:knife_opts] = " --server-url https://#{srv.container_ip(10, true)}"
+          else
+            ui.warn 'Local chef server is not currently running!' unless @action.to_sym == :status
+            Config[:knife_opts] = ' --server-url https://no-local-server'
+          end
         end
       end
     end
 
+    protected
+
     def setup_ui
-      Chef::Config[:color] = true
+      Chef::Config[:color] = Config[:color]
       @ui = Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
       self.class.ui = @ui
     end
 
     def validate!
       if(name.to_s == 'server')
-        raise 'Box name `server` is reserved and not allowed!'
+        ui.fatal "Invalid name supplied: #{ui.color(name, :red)}"
+        ui.info ui.color("  -> Try: vagabond server #{@action}", :cyan)
+        exit -1
       end
     end
     
     def execute
-      send(@action)
+      if(public_methods.include?(@action.to_sym))
+        send(@action)
+      else
+        ui.error "Invalid action received: #{@action}"
+      end
     end
 
-    private
-
     def generate_hash
       Digest::MD5.hexdigest(@vagabondfile.path)
     end
@@ -89,15 +103,6 @@ module Vagabond
       end
     end
     
-    def sudo
-      case @vagabondfile[:sudo]
-      when TrueClass
-        'sudo '
-      when String
-        "#{@vagabondfile[:sudo]} "
-      end
-    end
-
     def base_dir
       File.dirname(vagabondfile.path)
     end