factor-connector-chef 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51ef48d37d57d75484ac216ea3269273cd2bb374
-  data.tar.gz: 1912f728b59f8082716284c3bf2bfc3d85ca46b9
+  metadata.gz: 374cfde72a6fbc2f4b46b50e1556979a2f67b335
+  data.tar.gz: 94464ba0a1406322f018513abf4abf017fe5b155
 SHA512:
-  metadata.gz: 5417de7c5266663e0f83113f0a23609508307bf95b91cb9beb75f0aff7c88f706995aeea6e4947adfa5274b6ebf7dda575537ebdf14d66109f2764dcc6d2cb56
-  data.tar.gz: 5129a89ef81579e18c76eca7a5e02a805ffa69dd94eeb5329d6b5dda481d4bd91fe83f8e5380908162be35b495dae0cbbfa04c5fd82b0689adace546e8f8996d
+  metadata.gz: c50402b3b55474ba5b6ff06b64c1668d1a49c9ca8de19b28ff1af345027a0e42946b2c0b02e2321a57a8c4bcb3488948ea6b8e6005b55ee7b24869be4dc21cb1
+  data.tar.gz: b36543bfc3f3c079df3ac094ac8616c7e21272cd0d6531ec4f95127b40c00d3fd937680457979567e5014dd10d9fc2d991eb973bea20452876c081f4cd03e833

data/lib/factor/connector/chef.rb

@@ -4,6 +4,50 @@ require 'net/scp'
 require 'tempfile'
 require 'uri'
 
+class Net::SSH::Connection::Session
+  class CommandFailed < StandardError
+  end
+
+  class CommandExecutionFailed < StandardError
+  end
+
+  def exec_sc!(command)
+    stdout_data,stderr_data = "",""
+    exit_code,exit_signal = nil,nil
+    self.open_channel do |channel|
+      channel.exec(command) do |_, success|
+        raise CommandExecutionFailed, "Command \"#{command}\" was unable to execute" unless success
+
+        channel.on_data do |_,data|
+          stdout_data += data
+        end
+
+        channel.on_extended_data do |_,_,data|
+          stderr_data += data
+        end
+
+        channel.on_request("exit-status") do |_,data|
+          exit_code = data.read_long
+        end
+
+        channel.on_request("exit-signal") do |_, data|
+          exit_signal = data.read_long
+        end
+      end
+    end
+    self.loop
+
+    raise CommandFailed, "Command \"#{command}\" returned exit code #{exit_code}" unless exit_code == 0
+
+    {
+      stdout:stdout_data,
+      stderr:stderr_data,
+      exit_code:exit_code,
+      exit_signal:exit_signal
+    }
+  end
+end
+
 Factor::Connector.service 'chef' do
   action 'bootstrap' do |params|
     host_param     = params['host']
@@ -12,26 +56,30 @@ Factor::Connector.service 'chef' do
     runlist        = params['runlist']
     organization   = params['organization']
     node_name      = params['name']
+    environment    = params['environment']
+    chef_server    = params['chef_server']
+    output         = {}
 
     fail 'Host is required' unless host_param
     fail 'Private Key (private_key) is required' unless private_key
     fail 'Validation Key (validation_key) is required' unless validation_key
-    fail 'Organization (organization) is required' unless organization
+    fail 'Organization (organization) or Chef Server URL (chef_server) is required' unless organization || chef_server
+    fail 'Organization (organization) or Chef Server URL (chef_server) is required, but not both' if organization && chef_server
     fail 'Runlist (runlist) is required' unless runlist
     fail 'Node Name (name) is required' unless node_name
 
     validation_name = params['validation_name'] || "#{organization}-validator"
 
+    chef_server ||= "https://api.opscode.com/organizations/#{organization}"
+    info "Using '#{chef_server}' as the Chef Server address"
 
     info 'Setting  up the client.rb file'
     client_rb = ""
     client_rb << "log_location STDOUT\n"
-    client_rb << "chef_server_url  \"https://api.opscode.com/organizations/#{organization}\"\n"
+    client_rb << "chef_server_url  \"#{chef_server}\"\n"
     client_rb << "validation_client_name \"#{validation_name}\"\n"
     client_rb << "node_name \"#{node_name}\"\n"
 
-
-
     info 'Setting up private key'
     begin
       private_key_file = Tempfile.new('private')
@@ -56,30 +104,52 @@ Factor::Connector.service 'chef' do
     fail 'User (user) is required in host address' unless user
     fail 'Host variable must specific host address' unless host
 
+    install_command = 'curl -L https://www.opscode.com/chef/install.sh | sudo bash'
     setup_commands = [
-      'curl -L https://www.opscode.com/chef/install.sh | sudo bash',
+      install_command,
       'mkdir -p /etc/chef',
       'cd /etc/chef',
     ]
 
+    chef_client_options = {}
+    chef_client_options['runlist'] = runlist
+    chef_client_options['environment'] = environment if environment
+
+    run_command = []
+    chef_client_options.each do |option, value|
+      run_command << "--#{option} #{value}"
+    end
+
     run_commands = [
-      "chef-client --runlist #{runlist}"
+      "chef-client #{run_command.join(' ')}"
     ]
 
-    output = []
     begin
       Net::SSH.start(host, user, ssh_settings) do |ssh|
 
         info 'Running setup commands'
         setup_commands.each do |command|
           info "  running '#{command}'"
-          returned = ssh.exec!(command)
-          if returned && returned.is_a?(String)
-            lines = returned.split("\n")
-            lines.each do |line|
-              info "    #{line}"
+          output[command] ||= []
+          returned = ssh.exec_sc!(command)
+
+          returned[:stdout].split("\n").each do |line|
+            if returned[:exit_code]==0
+              output[command] << line
+            else
+              error "    #{line}"
+            end
+          end
+          returned[:stderr].split("\n").each do |line|
+            output[command] << line
+          end
+
+          if command == install_command
+            if returned[:stdout].include?('Thank you for installing Chef!') && returned[:exit_code]==0
+              info "Chef installed successfully"
+            else
+              fail "Install failed" 
             end
-            output = output + lines
           end
         end
 
@@ -97,14 +167,26 @@ Factor::Connector.service 'chef' do
 
         info 'Running chef bootstrap commands'
         run_commands.each do |command|
+          output[command] ||=[]
           info "  running '#{command}'"
-          returned = ssh.exec!(command)
-          if returned && returned.is_a?(String)
-            lines = returned.split("\n")
-            lines.each do |line|
-              info "    #{line}"
+
+          returned = ssh.exec_sc!(command)
+
+          returned[:stdout].split("\n").each do |line|
+            if returned[:exit_code]==0
+              output[command] << line
+            else
+              error "    #{line}"
             end
-            output = output + lines
+          end
+          returned[:stderr].split("\n").each do |line|
+            output[command] << line
+          end
+
+          if returned[:exit_code]==0
+            info "Command '#{command}' finished successfully"
+          else
+            fail "Command '#{command}' failed to run, exit code: #{returned[:exit_code]}" 
           end
         end
       end
@@ -119,9 +201,7 @@ Factor::Connector.service 'chef' do
       private_key_file.unlink
       validation_key_file.unlink
     rescue
-      warn 'Failed to clean up, but no worries, work will go on.'
     end
-
-    action_callback output: output
+    action_callback status: 'complete', output: output
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factor-connector-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh