chef-solo-wrapper 0.0.6 → 0.0.7

data/bin/cs

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CHEF_SOLO_WRAPPER_VERSION = '0.0.6'
+CHEF_SOLO_WRAPPER_VERSION = '0.0.7'
 COOKBOOKS_SRC_DEST = '/usr/src/chef-cookbooks'
 
 require 'rubygems'
@@ -103,6 +103,8 @@ if opts[:setup]
       config.install_rest_connection
     when 'config'
       config.setup_solo_rb(solo_file)
+    when 'config-sandbox'
+      config.setup_solo_rb_sandbox(solo_file)
     when 'node'
       config.setup_node_json(json_file)
     when 'all'
@@ -130,14 +132,15 @@ config.pre_checks
 
 # get json if available
 if opts[:json]
-  attributes = File.new(opts.json, "r").read
+  puts "    DEBUG: Using #{opts[:json]}."
+  attributes = File.new(opts[:json], "r").read
 else
-  if File.file?('/etc/chef/node.json')
-    node_file = '/etc/chef/node.json'
-    attributes = JSON.parse(File.new(node_file, "r").read)
+  if File.file?(json_file)
+    node_file = json_file
+    attributes = JSON.parse(File.new(json_file, "r").read)
   elsif File.file?("#{File.expand_path('~')}/node.json")
     node_file = "#{File.expand_path('~')}/node.json"
-    attributes = JSON.parse(File.new("#{File.expand_path('~')}/node.json", "r").read)
+    attributes = JSON.parse(File.new(node_file, "r").read)
   else
     node_file = "#{File.expand_path('~')}/node.json"
     attributes = JSON.parse("{\n}\n")
@@ -191,25 +194,29 @@ if opts[:server]
       end
     end
   }
-  puts "    DEBUG:\n#{p server_attributes}" unless !opts.debug
+  puts "    DEBUG:\n#{p server_attributes}" if opts[:debug]
 end
 
 # merge attributes
 if server_attributes
   puts server_attributes.to_json
-  puts '    DEBUG: Merging attributes.' unless !opts.debug
+  puts '    DEBUG: Merging attributes.' if opts[:debug]
   attributes = server_attributes.merge(attributes)
 else
-  puts '    DEBUG: No server attributes to merge.' unless !opts.debug
+  puts '    DEBUG: No server attributes to merge.' if opts[:debug]
 end
 
 # override runlist
 if opts[:run]
+  puts "    Overriding run_list with: #{opts[:run]}" if opts[:verbose]
   attributes['run_list'] = "#{opts[:run]}"
 end
 
+# new attributes
+puts "    DEBUG: Final attributes: #{attributes.to_json}" if opts[:debug]
+
 # write attributes back to local node.json
-if opts[:write] and server_attributes
+if opts[:write] and attributes
 	node_json = JSON.pretty_generate(attributes)
 	puts "    DEBUG: Node Attributes: \n #{node_json}" if opts[:debug]
 	puts "    DEBUG: Writing attributes to #{json_file}" if opts[:debug]
@@ -221,6 +228,9 @@ if opts[:write] and server_attributes
 	end
 end
 
+# debug for final node.json
+puts "== node.json ==\n#{File.open(json_file, "r").read}\n==" if ( opts[:debug] or opts[:verbose] )
+
 # pre append options
 chef_config = " -c #{opts[:config]}" if opts[:config]
 chef_json = " -j #{opts[:json]}" if opts[:json]
@@ -234,8 +244,7 @@ else
 end
 
 # build chef solo command
-cmd = "#{cs}#{chef_config}#{chef_json} --log_level #{opts.loglevel} || ( echo 'Chef run failed!'; cat /var/chef-solo/chef-stacktrace.out; exit 1 )"
-puts "    DEBUG: running #{cmd}" if opts[:debug]
+cmd = "#{cs}#{chef_config}#{chef_json} --log_level #{opts.loglevel}"
 
 # import chef
 puts 'Importing Chef RubyGem.' if opts[:verbose]
@@ -250,7 +259,13 @@ end
 # finally, run chef-solo
 puts 'Starting Chef Solo.' unless !(opts[:verbose] || opts[:debug])
 unless opts[:dry]
-  system(cmd)
+  begin
+    puts "    DEBUG: running #{cmd}" if opts[:debug]
+    system(cmd)
+  rescue
+    puts 'Chef run failed!'
+    exit 1
+  end
 else
   puts 'Dry run only, exiting.'
   exit

data/lib/config_helper.rb

@@ -30,9 +30,15 @@ class ConfigHelper
   def install_chef
     puts
     puts '=> Setting up Chef Solo.'
-    case "#{`lsb_release -si`.strip}"
+    lsb_release = system("`which lsb_release`")
+    if ! lsb_release
+      puts '    DEBUG: lsb_release not found.' if @debug
+      lsb_release = 'none'
+    end
+    case "#{lsb_release.strip}"
       when 'Ubuntu'
         puts 'Ubuntu detected; installing from opscode apt.'
+        ( puts 'Chef already installed, skipping.' and return ) if system("dpkg -l | grep chef")
         system("DEBIAN_FRONTEND=noninteractive")
         system("sudo mkdir -p /etc/apt/trusted.gpg.d")
         system("gpg --keyserver keys.gnupg.net --recv-keys 83EF826A")
@@ -56,6 +62,19 @@ class ConfigHelper
       end
     end
   end
+
+  def setup_solo_rb_sandbox(file, sandbox_version=5.8)
+    raise "RightScale cookbooks cache, /var/cache/rightscale/cookbooks not found!" unless File.exists?('/var/cache/rightscale/cookbooks')
+    puts "=> Setting up #{file}."
+    if sandbox_version.to_s == '5.8'
+      cookbooks_cache = '/var/cache/rightscale/cookbooks/default'
+    else
+      cookbooks_cache = '/var/cache/rightscale/cookbooks'
+    end
+    system('mkdir -p /etc/chef')
+    cookbooks_path = Dir.glob("#{cookbooks_cache}/*").map {|element| "\"#{element}\"" }.join(', ')
+    File.open(file, "w") {|f| f.write 'file_cache_path "/var/chef-solo"'+"\n"+'cookbook_path [ "'+"#{cookbooks_path}"+'" ]'+"\n"'json_attribs "/etc/chef/node.json"'+"\n"}
+  end
   
   def setup_solo_rb(file, auto=@setup_defaults)
     puts "=> Setting up #{file}."
@@ -145,19 +164,18 @@ class ConfigHelper
     end
     if File.file?("#{ENV['HOME']}/solo.rb")
       solo = "#{ENV['HOME']}/solo.rb"
-    else
-      puts '    DEBUG: ~/solo.rb: not found.' if @debug
+      puts "    DEBUG: Using #{ENV['HOME']}/solo.rb as preferred." if @debug      
     end
     unless solo
       puts 'FATAL: No solo.rb file found (see http://wiki.opscode.com/display/chef/Chef+Solo), exiting.'
       exit 1
     else
-      puts "==> Using #{solo}." if @debug
+      puts "    DEBUG: Using #{solo}." if @debug
       if File.zero?(solo) then
         puts "FATAL: #{solo} is empty, exiting."
         exit 1
       end 
-      puts File.new(solo, 'r').read if @debug
+      puts "== solo.rb ==\n#{File.new(solo, 'r').read.strip}\n==" if @debug
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-solo-wrapper
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Chris Fordham