[DRE-commits] [vagrant-libvirt] 23/77: Use Vagrant's default provision action

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.17
in repository vagrant-libvirt.

commit 99d6e7de45cffec8ac711aa2f129d807f186510a
Author: Brian Pitts <brian at polibyte.com>
Date:   Sat Mar 15 20:36:23 2014 -0500

    Use Vagrant's default provision action
---
 lib/vagrant-libvirt/action.rb                 |  3 +--
 lib/vagrant-libvirt/action/timed_provision.rb | 21 ---------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/lib/vagrant-libvirt/action.rb b/lib/vagrant-libvirt/action.rb
index ab22f27..f263faa 100644
--- a/lib/vagrant-libvirt/action.rb
+++ b/lib/vagrant-libvirt/action.rb
@@ -23,7 +23,7 @@ module VagrantPlugins
               b2.use CreateDomainVolume
               b2.use CreateDomain
 
-              b2.use TimedProvision
+              b2.use Provision
               b2.use CreateNetworks
               b2.use CreateNetworkInterfaces
 
@@ -323,7 +323,6 @@ module VagrantPlugins
       autoload :StartDomain, action_root.join('start_domain')
       autoload :SuspendDomain, action_root.join('suspend_domain')
       autoload :SyncFolders, action_root.join('sync_folders')
-      autoload :TimedProvision, action_root.join('timed_provision')
       autoload :WaitTillUp, action_root.join('wait_till_up')
       autoload :SSHRun,  'vagrant/action/builtin/ssh_run'
       autoload :HandleBoxUrl, 'vagrant/action/builtin/handle_box_url'
diff --git a/lib/vagrant-libvirt/action/timed_provision.rb b/lib/vagrant-libvirt/action/timed_provision.rb
deleted file mode 100644
index d8ce98e..0000000
--- a/lib/vagrant-libvirt/action/timed_provision.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'vagrant-libvirt/util/timer'
-
-module VagrantPlugins
-  module ProviderLibvirt
-    module Action
-      # This is the same as the builtin provision except it times the
-      # provisioner runs.
-      class TimedProvision < Vagrant::Action::Builtin::Provision
-        def run_provisioner(env)
-          timer = Util::Timer.time do
-            super
-          end
-
-          env[:metrics] ||= {}
-          env[:metrics]['provisioner_times'] ||= []
-          env[:metrics]['provisioner_times'] << [env[:provisioner].class.to_s, timer]
-        end
-      end
-    end
-  end
-end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git