chef-metal-vagrant 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 741c6c6f6607861923ef353ce6267bc3fb9df4b3
-  data.tar.gz: 98283bbb8116bd9d287bfb48b028cf7673cfbbbe
+  metadata.gz: c87c1ff4863d5dd308daf58ae90f1acb12ddc8eb
+  data.tar.gz: 3f32ecaad5a7075fb4551486ec2d55a97df2e665
 SHA512:
-  metadata.gz: af69bcaf65bf10d31a2032113c9abcbc12ec5b64c22560a5a2432904fffc79f8838f9a8acb9d491bc971911b9d5eb5aee76e5042a512db33454f692cb78971bf
-  data.tar.gz: 3f880fd4e7fbd28b26ea9412ccf3dcbe10c785dc6a0a33a2b50ab65cd3f185da6c6a4fb389140627b51dea641f02fdaa51c82319480556fd2276aa9db20da34a
+  metadata.gz: 4467be72de80093ae76247ef90b1b664ec4957d5bf6f057501db8190cea53bf24f3532ea9c5a3d8e4952f154cfafae8cefce8809ea24657877c28e3423d4f9e4
+  data.tar.gz: d8c1fc591cfc9456dd278d54e7af7e5bb7c838317001245cbf35d3fe6aadc38b46e4b874e1b4f26062719216eb70e9da86f03a08a165fc9556195b096fc9de13

data/lib/chef_metal_vagrant/vagrant_provisioner.rb

@@ -55,7 +55,7 @@ module ChefMetalVagrant
     #        instead of options provided by the provisioner.  TODO compare and
     #        fail if different?
     #        node will have node['normal']['provisioner_options'] in it with any options.
-    #        It is a hash with this format:
+    #        It is a hash with this format (all keys are strings):
     #
     #           -- provisioner_url: vagrant:<cluster_path>
     #           -- vagrant_options: hash of properties of the "config"
@@ -71,6 +71,8 @@ module ChefMetalVagrant
     #                is detected.
     #           -- up_timeout: maximum time, in seconds, to wait for vagrant
     #              to bring up the machine.  Defaults to 10 minutes.
+    #           -- chef_client_timeout: maximum time, in seconds, to wait for chef-client
+    #              to complete.  0 or nil for no timeout.  Defaults to 2 hours.
     #
     #        node['normal']['provisioner_output'] will be populated with information
     #        about the created machine.  For vagrant, it is a hash with this
@@ -83,7 +85,7 @@ module ChefMetalVagrant
     #           -- forwarded_ports: hash with key as guest_port => host_port
     #
     def acquire_machine(action_handler, node)
-      # Set up the modified node data
+      # Set up the provisioner output
       provisioner_options = node['normal']['provisioner_options']
       vm_name = node['name']
       old_provisioner_output = node['normal']['provisioner_output']
@@ -99,50 +101,12 @@ module ChefMetalVagrant
       # over (perhaps introduce a boolean that will force a delete and recreate
       # in such a case)
 
-      # Determine contents of vm file
-      vm_file_content = "Vagrant.configure('2') do |outer_config|\n"
-      vm_file_content << "  outer_config.vm.define #{vm_name.inspect} do |config|\n"
-      merged_vagrant_options = { 'vm.hostname' => node['name'] }
-      merged_vagrant_options.merge!(provisioner_options['vagrant_options']) if provisioner_options['vagrant_options']
-      merged_vagrant_options.each_pair do |key, value|
-        vm_file_content << "    config.#{key} = #{value.inspect}\n"
-      end
-      vm_file_content << provisioner_options['vagrant_config'] if provisioner_options['vagrant_config']
-      vm_file_content << "  end\nend\n"
-
-      # Set up vagrant file
-      vm_file = ChefMetal.inline_resource(action_handler) do
-        file provisioner_output['vm_file_path'] do
-          content vm_file_content
-          action :create
-        end
-      end
-
-      # Check current status of vm
-      current_status = vagrant_status(vm_name)
-      up_timeout = provisioner_options['up_timeout'] || 10*60
-
-      if current_status != 'running'
-        # Run vagrant up if vm is not running
-        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}"
-          end
-          parse_vagrant_up(result.stdout, node)
-        end
-      elsif vm_file.updated_by_last_action?
-        # Run vagrant reload if vm is running and vm file changed
-        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}"
-          end
-          parse_vagrant_up(result.stdout, node)
-        end
-      end
-
-      # Create machine object for callers to use
+      #
+      # This is where the work gets done:
+      # Create the .vm file, start the vm, and return the Machine
+      #
+      vm_file = create_vm_file(action_handler, vm_name, provisioner_output['vm_file_path'], provisioner_options)
+      start_machine(action_handler, vm_name, vm_file, provisioner_output, provisioner_options['up_timeout'])
       machine_for(node)
     end
 
@@ -214,18 +178,65 @@ module ChefMetalVagrant
       "vagrant_cluster://#{action_handler.node['name']}#{cluster_path}"
     end
 
-    def parse_vagrant_up(output, node)
+    def create_vm_file(action_handler, vm_name, vm_file_path, provisioner_options)
+      # Determine contents of vm file
+      vm_file_content = "Vagrant.configure('2') do |outer_config|\n"
+      vm_file_content << "  outer_config.vm.define #{vm_name.inspect} do |config|\n"
+      merged_vagrant_options = { 'vm.hostname' => vm_name }
+      merged_vagrant_options.merge!(provisioner_options['vagrant_options']) if provisioner_options['vagrant_options']
+      merged_vagrant_options.each_pair do |key, value|
+        vm_file_content << "    config.#{key} = #{value.inspect}\n"
+      end
+      vm_file_content << provisioner_options['vagrant_config'] if provisioner_options['vagrant_config']
+      vm_file_content << "  end\nend\n"
+
+      # Set up vagrant file
+      ChefMetal.inline_resource(action_handler) do
+        file vm_file_path do
+          content vm_file_content
+          action :create
+        end
+      end
+    end
+
+    def start_machine(action_handler, vm_name, vm_file, provisioner_output, up_timeout)
+      # Check current status of vm
+      current_status = vagrant_status(vm_name)
+      up_timeout ||= 10*60
+
+      if current_status != 'running'
+        # Run vagrant up if vm is not running
+        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}"
+          end
+          parse_vagrant_up(result.stdout, provisioner_output)
+        end
+      elsif vm_file.updated_by_last_action?
+        # Run vagrant reload if vm is running and vm file changed
+        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}"
+          end
+          parse_vagrant_up(result.stdout, provisioner_output)
+        end
+      end
+    end
+
+    def parse_vagrant_up(output, provisioner_output)
       # Grab forwarded port info
+      provisioner_output['forwarded_ports'] = {}
       in_forwarding_ports = false
       output.lines.each do |line|
         if in_forwarding_ports
           if line =~ /-- (\d+) => (\d+)/
-            node['normal']['provisioner_output']['forwarded_ports'][$1] = $2
+            provisioner_output['forwarded_ports'][$1] = $2
           else
             in_forwarding_ports = false
           end
         elsif line =~ /Forwarding ports...$/
-          node['normal']['provisioner_output']['forwarded_ports'] = {}
           in_forwarding_ports = true
         end
       end
@@ -242,11 +253,17 @@ module ChefMetalVagrant
     def convergence_strategy_for(node)
       if vagrant_option(node, 'vm.guest').to_s == 'windows'
         @windows_convergence_strategy ||= begin
-          ChefMetal::ConvergenceStrategy::InstallMsi.new
+          options = {}
+          provisioner_options = node['normal']['provisioner_options'] || {}
+          options[:chef_client_timeout] = provisioner_options['chef_client_timeout'] if provisioner_options.has_key?('chef_client_timeout')
+          ChefMetal::ConvergenceStrategy::InstallMsi.new(options)
         end
       else
         @unix_convergence_strategy ||= begin
-          ChefMetal::ConvergenceStrategy::InstallCached.new
+          options = {}
+          provisioner_options = node['normal']['provisioner_options'] || {}
+          options[:chef_client_timeout] = provisioner_options['chef_client_timeout'] if provisioner_options.has_key?('chef_client_timeout')
+          ChefMetal::ConvergenceStrategy::InstallCached.new(options)
         end
       end
     end

data/lib/chef_metal_vagrant/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVagrant
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-vagrant
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef