chef-metal 0.4 → 0.5

data/lib/chef_metal/provisioner/vagrant_provisioner.rb

@@ -8,7 +8,6 @@ module ChefMetal
     class VagrantProvisioner < Provisioner
 
       include Chef::Mixin::ShellOut
-
       # Create a new vagrant provisioner.
       #
       # ## Parameters
@@ -20,6 +19,20 @@ module ChefMetal
 
       attr_reader :cluster_path
 
+      # Inflate a provisioner from node information; we don't want to force the
+      # driver to figure out what the provisioner really needs, since it varies
+      # from provisioner to provisioner.
+      #
+      # ## Parameters
+      # node - node to inflate the provisioner for
+      #
+      # returns a VagrantProvisioner
+      def self.inflate(node)
+        node_url = node['normal']['provisioner_output']['provisioner_url']
+        cluster_path = node_url.split(':', 2)[1].sub(/^\/\//, "")
+        self.new(cluster_path)
+      end
+
       # Acquire a machine, generally by provisioning it.  Returns a Machine
       # object pointing at the machine, allowing useful actions like setup,
       # converge, execute, file and directory.  The Machine object will have a
@@ -27,7 +40,11 @@ module ChefMetal
       # different from the original node object).
       #
       # ## Parameters
-      # provider - the provider object that is calling this method.
+      # action_handler - the action_handler object that is calling this method; this
+      #        is generally a action_handler, but could be anything that can support the
+      #        ChefMetal::ActionHandler interface (i.e., in the case of the test
+      #        kitchen metal driver for acquiring and destroying VMs; see the base
+      #        class for what needs providing).
       # node - node object (deserialized json) representing this machine.  If
       #        the node has a provisioner_options hash in it, these will be used
       #        instead of options provided by the provisioner.  TODO compare and
@@ -60,13 +77,13 @@ module ChefMetal
       #              on disk
       #           -- forwarded_ports: hash with key as guest_port => host_port
       #
-      def acquire_machine(provider, node)
+      def acquire_machine(action_handler, node)
         # Set up the modified node data
         provisioner_options = node['normal']['provisioner_options']
         vm_name = node['name']
         old_provisioner_output = node['normal']['provisioner_output']
         node['normal']['provisioner_output'] = provisioner_output = {
-          'provisioner_url' => provisioner_url(provider),
+          'provisioner_url' => provisioner_url(action_handler),
           'vm_name' => vm_name,
           'vm_file_path' => File.join(cluster_path, "#{vm_name}.vm")
         }
@@ -89,7 +106,7 @@ module ChefMetal
         vm_file_content << "  end\nend\n"
 
         # Set up vagrant file
-        vm_file = ChefMetal.inline_resource(provider) do
+        vm_file = ChefMetal.inline_resource(action_handler) do
           file provisioner_output['vm_file_path'] do
             content vm_file_content
             action :create
@@ -102,7 +119,7 @@ module ChefMetal
 
         if current_status != 'running'
           # Run vagrant up if vm is not running
-          provider.converge_by "run vagrant up #{vm_name} (status was '#{current_status}')" do
+          action_handler.perform_action "run vagrant up #{vm_name} (status was '#{current_status}')" do
             result = shell_out("vagrant up #{vm_name}", :cwd => cluster_path, :timeout => up_timeout)
             if result.exitstatus != 0
               raise "vagrant up #{vm_name} failed!\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
@@ -111,7 +128,7 @@ module ChefMetal
           end
         elsif vm_file.updated_by_last_action?
           # Run vagrant reload if vm is running and vm file changed
-          provider.converge_by "run vagrant reload #{vm_name}" do
+          action_handler.perform_action "run vagrant reload #{vm_name}" do
             result = shell_out("vagrant reload #{vm_name}", :cwd => cluster_path, :timeout => up_timeout)
             if result.exitstatus != 0
               raise "vagrant reload #{vm_name} failed!\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
@@ -129,7 +146,7 @@ module ChefMetal
         machine_for(node)
       end
 
-      def delete_machine(provider, node)
+      def delete_machine(action_handler, node)
         if node['normal'] && node['normal']['provisioner_output']
           provisioner_output = node['normal']['provisioner_output']
         else
@@ -138,7 +155,7 @@ module ChefMetal
         vm_name = provisioner_output['vm_name'] || node['name']
         current_status = vagrant_status(vm_name)
         if current_status != 'not created'
-          provider.converge_by "run vagrant destroy -f #{vm_name} (status was '#{current_status}')" do
+          action_handler.perform_action "run vagrant destroy -f #{vm_name} (status was '#{current_status}')" do
             result = shell_out("vagrant destroy -f #{vm_name}", :cwd => cluster_path)
             if result.exitstatus != 0
               raise "vagrant destroy failed!\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
@@ -146,17 +163,17 @@ module ChefMetal
           end
         end
 
-        convergence_strategy_for(node).delete_chef_objects(provider, node)
+        convergence_strategy_for(node).cleanup_convergence(action_handler, node)
 
         vm_file_path = provisioner_output['vm_file_path'] || File.join(cluster_path, "#{vm_name}.vm")
-        ChefMetal.inline_resource(provider) do
+        ChefMetal.inline_resource(action_handler) do
           file vm_file_path do
             action :delete
           end
         end
       end
 
-      def stop_machine(provider, node)
+      def stop_machine(action_handler, node)
         if node['normal'] && node['normal']['provisioner_output']
           provisioner_output = node['normal']['provisioner_output']
         else
@@ -165,7 +182,7 @@ module ChefMetal
         vm_name = provisioner_output['vm_name'] || node['name']
         current_status = vagrant_status(vm_name)
         if current_status == 'running'
-          provider.converge_by "run vagrant halt #{vm_name} (status was '#{current_status}')" do
+          action_handler.perform_action "run vagrant halt #{vm_name} (status was '#{current_status}')" do
             result = shell_out("vagrant halt #{vm_name}", :cwd => cluster_path)
             if result.exitstatus != 0
               raise "vagrant halt failed!\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
@@ -188,8 +205,8 @@ module ChefMetal
 
       protected
 
-      def provisioner_url(provider)
-        "vagrant_cluster://#{provider.node['name']}#{cluster_path}"
+      def provisioner_url(action_handler)
+        "vagrant_cluster://#{action_handler.node['name']}#{cluster_path}"
       end
 
       def parse_vagrant_up(output, node)

data/lib/chef_metal/provisioner_init/fog_init.rb

@@ -0,0 +1,4 @@
+require 'chef_metal/provisioner/fog_provisioner'
+
+ChefMetal.add_registered_provisioner_class("fog",
+  ChefMetal::Provisioner::FogProvisioner)

data/lib/chef_metal/provisioner_init/vagrant_cluster_init.rb

@@ -0,0 +1,4 @@
+require 'chef_metal/provisioner/vagrant_provisioner'
+
+ChefMetal.add_registered_provisioner_class("vagrant_cluster",
+  ChefMetal::Provisioner::VagrantProvisioner)

data/lib/chef_metal/transport/ssh.rb

@@ -23,6 +23,14 @@ module ChefMetal
         stderr = ''
         exitstatus = nil
         channel = session.open_channel do |channel|
+          # Enable PTY unless otherwise specified, some instances require this
+          unless options[:ssh_pty_enable] == false
+            channel.request_pty do |chan, success|
+               raise "could not get pty" if !success && options[:ssh_pty_enable]
+            end
+          end
+
+
           channel.exec("#{options[:prefix]}#{command}") do |ch, success|
             raise "could not execute command: #{command.inspect}" unless success
 
@@ -154,4 +162,4 @@ module ChefMetal
       end
     end
   end
-end
+end

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.4'
+  VERSION = '0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -129,10 +129,12 @@ files:
 - lib/chef/resource/machine_file.rb
 - lib/chef/resource/vagrant_box.rb
 - lib/chef/resource/vagrant_cluster.rb
+- lib/chef_metal/action_handler.rb
 - lib/chef_metal/aws_credentials.rb
 - lib/chef_metal/convergence_strategy/install_cached.rb
 - lib/chef_metal/convergence_strategy/install_msi.rb
 - lib/chef_metal/convergence_strategy/install_sh.rb
+- lib/chef_metal/convergence_strategy/no_converge.rb
 - lib/chef_metal/convergence_strategy/precreate_chef_objects.rb
 - lib/chef_metal/convergence_strategy.rb
 - lib/chef_metal/fog.rb
@@ -142,9 +144,12 @@ files:
 - lib/chef_metal/machine/windows_machine.rb
 - lib/chef_metal/machine.rb
 - lib/chef_metal/openstack_credentials.rb
+- lib/chef_metal/provider_action_handler.rb
 - lib/chef_metal/provisioner/fog_provisioner.rb
 - lib/chef_metal/provisioner/vagrant_provisioner.rb
 - lib/chef_metal/provisioner.rb
+- lib/chef_metal/provisioner_init/fog_init.rb
+- lib/chef_metal/provisioner_init/vagrant_cluster_init.rb
 - lib/chef_metal/recipe_dsl.rb
 - lib/chef_metal/transport/ssh.rb
 - lib/chef_metal/transport/winrm.rb