chef-provisioning-vagrant 0.8 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3522646df8b8a265ecfe0db79943ec0dc006f88f
-  data.tar.gz: 887d844f7f0becc83ddfb6230c1aaf2c7737682a
+  metadata.gz: 0b0e9e875e0ebe8b96d73f54af917532954fb1bc
+  data.tar.gz: de2e6bf4c1f09c031d21d0bc45ddc083116e6e76
 SHA512:
-  metadata.gz: 5bcf3b3b9a3b196284abf749a945d2cf894004f33a3fb563b48048fa1adadbb52bf38ea20a0fbc48cb0bf856f63603fe841e351821a64b956bf9d17d2c9efb79
-  data.tar.gz: 2d7124e6868d236ece82445a676c0259ccb6968010e9d5ca69d1a1bde3b453934e22b7aabcccb60c849d69a003d72e7e020ba11cb671a9cbca2ae272ef3448f0
+  metadata.gz: 7675d487e093ba11dc7ff36875c2975c4fcdfd23e3ab0ec5e3d0d1fa1f77bf656f9f6e34717b42baf68fdc04ebaba119154f01d6caea63791ae87b9971f789e3
+  data.tar.gz: f7fc221bbc66a2a4d3a1ce72199c3a8ab32249b86869d8230f39811ffd82341a385740d5a7ef52d5a7aa3789d77dcaf7ed7f2a2a90e528e7e11e0d46edb1e7c5

data/README.md

@@ -1,3 +1,3 @@
-# chef-metal-vagrant
+# chef-provisioning-vagrant
 
-This is the Vagrant driver for chef-metal.
+This is the Vagrant driver for chef-provisioning.

data/lib/chef/provisioning/driver_init/vagrant.rb

@@ -1,3 +1,3 @@
 require 'chef/provisioning/vagrant_driver/driver'
 
-ChefMetal.register_driver_class("vagrant", Chef::Provisioning::VagrantDriver::Driver)
+Chef::Provisioning.register_driver_class("vagrant", Chef::Provisioning::VagrantDriver::Driver)

data/lib/chef/provisioning/vagrant_driver.rb

@@ -1,4 +1,4 @@
-require 'chef_metal'
+require 'chef/provisioning'
 require 'chef/resource/vagrant_cluster'
 require 'chef/provider/vagrant_cluster'
 require 'chef/resource/vagrant_box'
@@ -16,7 +16,7 @@ class Chef
           new_options = { :vagrant_options => { 'vm.box' => box_name } }
         end
 
-        run_context.chef_metal.add_machine_options(new_options, &block)
+        run_context.chef_provisioning.add_machine_options(new_options, &block)
       end
     end
   end

data/lib/chef/provisioning/vagrant_driver/driver.rb

@@ -1,11 +1,11 @@
 require 'chef/mixin/shell_out'
-require 'chef_metal/driver'
-require 'chef_metal/machine/windows_machine'
-require 'chef_metal/machine/unix_machine'
-require 'chef_metal/convergence_strategy/install_msi'
-require 'chef_metal/convergence_strategy/install_cached'
-require 'chef_metal/transport/winrm'
-require 'chef_metal/transport/ssh'
+require 'chef/provisioning/driver'
+require 'chef/provisioning/machine/windows_machine'
+require 'chef/provisioning/machine/unix_machine'
+require 'chef/provisioning/convergence_strategy/install_msi'
+require 'chef/provisioning/convergence_strategy/install_cached'
+require 'chef/provisioning/transport/winrm'
+require 'chef/provisioning/transport/ssh'
 require 'chef/provisioning/vagrant_driver/version'
 require 'chef/resource/vagrant_cluster'
 require 'chef/provider/vagrant_cluster'
@@ -14,7 +14,7 @@ class Chef
 module Provisioning
 module VagrantDriver
   # Provisions machines in vagrant.
-  class Driver < ChefMetal::Driver
+  class Driver < Chef::Provisioning::Driver
 
     include Chef::Mixin::ShellOut
 
@@ -96,7 +96,7 @@ module VagrantDriver
           cleanup_convergence(action_handler, machine_spec)
 
         vm_file_path = machine_spec.location['vm_file_path']
-        ChefMetal.inline_resource(action_handler) do
+        Chef::Provisioning.inline_resource(action_handler) do
           file vm_file_path do
             action :delete
           end
@@ -158,7 +158,7 @@ module VagrantDriver
         convergence_strategy_for(spec, options).cleanup_convergence(action_handler, spec)
 
         vm_file_path = spec.location['vm_file_path']
-        ChefMetal.inline_resource(action_handler) do
+        Chef::Provisioning.inline_resource(action_handler) do
           file vm_file_path do
             action :delete
           end
@@ -208,7 +208,7 @@ module VagrantDriver
 
     def ensure_vagrant_cluster(action_handler)
       _cluster_path = cluster_path
-      ChefMetal.inline_resource(action_handler) do
+      Chef::Provisioning.inline_resource(action_handler) do
         vagrant_cluster _cluster_path
       end
     end
@@ -228,7 +228,7 @@ module VagrantDriver
       vm_file_content << "  end\nend\n"
 
       # Set up vagrant file
-      ChefMetal.inline_resource(action_handler) do
+      Chef::Provisioning.inline_resource(action_handler) do
         file vm_file_path do
           content vm_file_content
           action :create
@@ -362,10 +362,10 @@ module VagrantDriver
 
     def machine_for(machine_spec, machine_options)
       if machine_spec.location['vm.guest'].to_s == 'windows'
-        ChefMetal::Machine::WindowsMachine.new(machine_spec, transport_for(machine_spec),
+        Chef::Provisioning::Machine::WindowsMachine.new(machine_spec, transport_for(machine_spec),
           convergence_strategy_for(machine_spec, machine_options))
       else
-        ChefMetal::Machine::UnixMachine.new(machine_spec, transport_for(machine_spec),
+        Chef::Provisioning::Machine::UnixMachine.new(machine_spec, transport_for(machine_spec),
           convergence_strategy_for(machine_spec, machine_options))
       end
     end
@@ -373,12 +373,12 @@ module VagrantDriver
     def convergence_strategy_for(machine_spec, machine_options)
       if machine_spec.location['vm.guest'].to_s == 'windows'
         @windows_convergence_strategy ||= begin
-          ChefMetal::ConvergenceStrategy::InstallMsi.
+          Chef::Provisioning::ConvergenceStrategy::InstallMsi.
                                               new(machine_options[:convergence_options], config)
         end
       else
         @unix_convergence_strategy ||= begin
-          ChefMetal::ConvergenceStrategy::InstallCached.
+          Chef::Provisioning::ConvergenceStrategy::InstallCached.
                                            new(machine_options[:convergence_options], config)
         end
       end
@@ -416,7 +416,7 @@ module VagrantDriver
         :disable_sspi => true
       }
 
-      ChefMetal::Transport::WinRM.new(endpoint, type, options)
+      Chef::Provisioning::Transport::WinRM.new(endpoint, type, options)
     end
 
     def create_ssh_transport(machine_spec)
@@ -435,7 +435,7 @@ module VagrantDriver
       options = {
         :prefix => 'sudo '
       }
-      ChefMetal::Transport::SSH.new(hostname, username, ssh_options, options, config)
+      Chef::Provisioning::Transport::SSH.new(hostname, username, ssh_options, options, config)
     end
 
     def vagrant_ssh_config_for(machine_spec)

data/lib/chef/provisioning/vagrant_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module VagrantDriver
-  VERSION = '0.8'
+  VERSION = '0.8.1'
 end
 end
 end

data/lib/chef/resource/vagrant_cluster.rb

@@ -11,7 +11,7 @@ class Chef::Resource::VagrantCluster < Chef::Resource::LWRPBase
 
   def after_created
     super
-    run_context.chef_metal.with_driver "vagrant:#{path}"
+    run_context.chef_provisioning.with_driver "vagrant:#{path}"
   end
 
   # We are not interested in Chef's cloning behavior here.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vagrant
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: 0.8.1
 platform: ruby
 authors:
 - John Keiser