[DRE-commits] [vagrant-libvirt] 55/104: fix namespace Libvirt collision with ruby-libvirt library
Antonio Terceiro
terceiro at moszumanska.debian.org
Sun Apr 24 13:55:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to annotated tag 0.0.11
in repository vagrant-libvirt.
commit 09892ef2acc298c5b4d56998e39aca0c380cc184
Author: Hiroshi Miura <miurahr at linux.com>
Date: Wed Jul 31 09:20:43 2013 +0900
fix namespace Libvirt collision with ruby-libvirt library
---
CHANGELOG.md | 5 +++++
lib/vagrant-libvirt.rb | 2 +-
lib/vagrant-libvirt/action.rb | 2 +-
lib/vagrant-libvirt/action/connect_libvirt.rb | 8 ++++----
lib/vagrant-libvirt/action/create_domain.rb | 6 +++---
lib/vagrant-libvirt/action/create_domain_volume.rb | 8 ++++----
lib/vagrant-libvirt/action/create_network_interfaces.rb | 6 +++---
lib/vagrant-libvirt/action/create_networks.rb | 6 +++---
lib/vagrant-libvirt/action/destroy_domain.rb | 2 +-
lib/vagrant-libvirt/action/destroy_networks.rb | 2 +-
lib/vagrant-libvirt/action/halt_domain.rb | 2 +-
lib/vagrant-libvirt/action/handle_box_image.rb | 6 +++---
lib/vagrant-libvirt/action/handle_storage_pool.rb | 6 +++---
lib/vagrant-libvirt/action/is_created.rb | 2 +-
lib/vagrant-libvirt/action/is_running.rb | 2 +-
lib/vagrant-libvirt/action/is_suspended.rb | 2 +-
lib/vagrant-libvirt/action/message_already_created.rb | 2 +-
lib/vagrant-libvirt/action/message_not_created.rb | 2 +-
lib/vagrant-libvirt/action/message_not_running.rb | 2 +-
lib/vagrant-libvirt/action/message_not_suspended.rb | 2 +-
lib/vagrant-libvirt/action/prepare_nfs_settings.rb | 2 +-
lib/vagrant-libvirt/action/prune_nfs_exports.rb | 2 +-
lib/vagrant-libvirt/action/read_ssh_info.rb | 2 +-
lib/vagrant-libvirt/action/read_state.rb | 2 +-
lib/vagrant-libvirt/action/resume_domain.rb | 2 +-
lib/vagrant-libvirt/action/set_name_of_domain.rb | 4 ++--
lib/vagrant-libvirt/action/share_folders.rb | 2 +-
lib/vagrant-libvirt/action/start_domain.rb | 2 +-
lib/vagrant-libvirt/action/suspend_domain.rb | 2 +-
lib/vagrant-libvirt/action/sync_folders.rb | 2 +-
lib/vagrant-libvirt/action/timed_provision.rb | 2 +-
lib/vagrant-libvirt/action/wait_till_up.rb | 2 +-
lib/vagrant-libvirt/config.rb | 2 +-
lib/vagrant-libvirt/errors.rb | 2 +-
lib/vagrant-libvirt/plugin.rb | 2 +-
lib/vagrant-libvirt/provider.rb | 2 +-
lib/vagrant-libvirt/util.rb | 2 +-
lib/vagrant-libvirt/util/collection.rb | 2 +-
lib/vagrant-libvirt/util/erb_template.rb | 2 +-
lib/vagrant-libvirt/util/libvirt_util.rb | 2 +-
lib/vagrant-libvirt/util/timer.rb | 2 +-
lib/vagrant-libvirt/version.rb | 2 +-
vagrant-libvirt.gemspec | 2 +-
43 files changed, 64 insertions(+), 59 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 391efd7..f2e7b50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.0.7
+
+* Fixed namespace collision with ruby-libvirt library which used by
+ vagrant-kvm provider.(by Hiroshi Miura)
+
# 0.0.6 (Jul 24, 2013)
* Synced folder via NFS support.
diff --git a/lib/vagrant-libvirt.rb b/lib/vagrant-libvirt.rb
index 264906d..6d1f899 100644
--- a/lib/vagrant-libvirt.rb
+++ b/lib/vagrant-libvirt.rb
@@ -2,7 +2,7 @@ require 'pathname'
require 'vagrant-libvirt/plugin'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
lib_path = Pathname.new(File.expand_path("../vagrant-libvirt", __FILE__))
autoload :Action, lib_path.join("action")
autoload :Errors, lib_path.join("errors")
diff --git a/lib/vagrant-libvirt/action.rb b/lib/vagrant-libvirt/action.rb
index 787f875..589fa53 100644
--- a/lib/vagrant-libvirt/action.rb
+++ b/lib/vagrant-libvirt/action.rb
@@ -1,7 +1,7 @@
require 'vagrant/action/builder'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Include the built-in modules so we can use them as top-level things.
include Vagrant::Action::Builtin
diff --git a/lib/vagrant-libvirt/action/connect_libvirt.rb b/lib/vagrant-libvirt/action/connect_libvirt.rb
index d48236b..aab1d06 100644
--- a/lib/vagrant-libvirt/action/connect_libvirt.rb
+++ b/lib/vagrant-libvirt/action/connect_libvirt.rb
@@ -2,7 +2,7 @@ require 'fog'
require 'log4r'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class ConnectLibvirt
def initialize(app, env)
@@ -14,8 +14,8 @@ module VagrantPlugins
# If already connected to libvirt, just use it and don't connect
# again.
- if Libvirt.libvirt_connection
- env[:libvirt_compute] = Libvirt.libvirt_connection
+ if ProviderLibvirt.libvirt_connection
+ env[:libvirt_compute] = ProviderLibvirt.libvirt_connection
return @app.call(env)
end
@@ -64,7 +64,7 @@ module VagrantPlugins
raise Errors::FogLibvirtConnectionError,
:error_message => e.message
end
- Libvirt.libvirt_connection = env[:libvirt_compute]
+ ProviderLibvirt.libvirt_connection = env[:libvirt_compute]
@app.call(env)
end
diff --git a/lib/vagrant-libvirt/action/create_domain.rb b/lib/vagrant-libvirt/action/create_domain.rb
index a54870b..504c973 100644
--- a/lib/vagrant-libvirt/action/create_domain.rb
+++ b/lib/vagrant-libvirt/action/create_domain.rb
@@ -1,11 +1,11 @@
require 'log4r'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class CreateDomain
- include VagrantPlugins::Libvirt::Util::ErbTemplate
+ include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
def initialize(app, env)
@logger = Log4r::Logger.new("vagrant_libvirt::action::create_domain")
@@ -28,7 +28,7 @@ module VagrantPlugins
@os_type = 'hvm'
# Get path to domain image.
- domain_volume = Libvirt::Util::Collection.find_matching(
+ domain_volume = ProviderLibvirt::Util::Collection.find_matching(
env[:libvirt_compute].volumes.all, "#{@name}.img")
raise Errors::DomainVolumeExists if domain_volume == nil
@domain_volume_path = domain_volume.path
diff --git a/lib/vagrant-libvirt/action/create_domain_volume.rb b/lib/vagrant-libvirt/action/create_domain_volume.rb
index 021b47b..2d536b6 100644
--- a/lib/vagrant-libvirt/action/create_domain_volume.rb
+++ b/lib/vagrant-libvirt/action/create_domain_volume.rb
@@ -1,14 +1,14 @@
require 'log4r'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Create a snapshot of base box image. This new snapshot is just new
# cow image with backing storage pointing to base box image. Use this
# image as new domain volume.
class CreateDomainVolume
- include VagrantPlugins::Libvirt::Util::ErbTemplate
+ include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
def initialize(app, env)
@logger = Log4r::Logger.new("vagrant_libvirt::action::create_domain_volume")
@@ -25,12 +25,12 @@ module VagrantPlugins
@name = "#{env[:domain_name]}.img"
# Verify the volume doesn't exist already.
- domain_volume = Libvirt::Util::Collection.find_matching(
+ domain_volume = ProviderLibvirt::Util::Collection.find_matching(
env[:libvirt_compute].volumes.all, @name)
raise Errors::DomainVolumeExists if domain_volume
# Get path to backing image - box volume.
- box_volume = Libvirt::Util::Collection.find_matching(
+ box_volume = ProviderLibvirt::Util::Collection.find_matching(
env[:libvirt_compute].volumes.all, env[:box_volume_name])
@backing_file = box_volume.path
diff --git a/lib/vagrant-libvirt/action/create_network_interfaces.rb b/lib/vagrant-libvirt/action/create_network_interfaces.rb
index 5eebb75..9cf27d0 100644
--- a/lib/vagrant-libvirt/action/create_network_interfaces.rb
+++ b/lib/vagrant-libvirt/action/create_network_interfaces.rb
@@ -3,14 +3,14 @@ require 'vagrant/util/network_ip'
require 'vagrant/util/scoped_hash_override'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Create network interfaces for domain, before domain is running.
# Networks for connecting those interfaces should be already prepared.
class CreateNetworkInterfaces
- include VagrantPlugins::Libvirt::Util::ErbTemplate
- include VagrantPlugins::Libvirt::Util::LibvirtUtil
+ include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+ include VagrantPlugins::ProviderLibvirt::Util::LibvirtUtil
include Vagrant::Util::NetworkIP
include Vagrant::Util::ScopedHashOverride
diff --git a/lib/vagrant-libvirt/action/create_networks.rb b/lib/vagrant-libvirt/action/create_networks.rb
index 3114351..c1d8ce5 100644
--- a/lib/vagrant-libvirt/action/create_networks.rb
+++ b/lib/vagrant-libvirt/action/create_networks.rb
@@ -4,14 +4,14 @@ require 'vagrant/util/scoped_hash_override'
require 'ipaddr'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Prepare all networks needed for domain connections.
class CreateNetworks
include Vagrant::Util::NetworkIP
include Vagrant::Util::ScopedHashOverride
- include VagrantPlugins::Libvirt::Util::ErbTemplate
- include VagrantPlugins::Libvirt::Util::LibvirtUtil
+ include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+ include VagrantPlugins::ProviderLibvirt::Util::LibvirtUtil
def initialize(app, env)
@logger = Log4r::Logger.new("vagrant_libvirt::action::create_networks")
diff --git a/lib/vagrant-libvirt/action/destroy_domain.rb b/lib/vagrant-libvirt/action/destroy_domain.rb
index 91cdac1..e00daf6 100644
--- a/lib/vagrant-libvirt/action/destroy_domain.rb
+++ b/lib/vagrant-libvirt/action/destroy_domain.rb
@@ -1,7 +1,7 @@
require 'log4r'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class DestroyDomain
def initialize(app, env)
diff --git a/lib/vagrant-libvirt/action/destroy_networks.rb b/lib/vagrant-libvirt/action/destroy_networks.rb
index 853be33..53d123f 100644
--- a/lib/vagrant-libvirt/action/destroy_networks.rb
+++ b/lib/vagrant-libvirt/action/destroy_networks.rb
@@ -2,7 +2,7 @@ require 'log4r'
require 'nokogiri'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Destroy all networks created for this specific domain. Skip
# removing if network has still active connections.
diff --git a/lib/vagrant-libvirt/action/halt_domain.rb b/lib/vagrant-libvirt/action/halt_domain.rb
index 3648101..bf84c95 100644
--- a/lib/vagrant-libvirt/action/halt_domain.rb
+++ b/lib/vagrant-libvirt/action/halt_domain.rb
@@ -1,7 +1,7 @@
require 'log4r'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Halt the domain.
class HaltDomain
diff --git a/lib/vagrant-libvirt/action/handle_box_image.rb b/lib/vagrant-libvirt/action/handle_box_image.rb
index 45b7691..a561bea 100644
--- a/lib/vagrant-libvirt/action/handle_box_image.rb
+++ b/lib/vagrant-libvirt/action/handle_box_image.rb
@@ -1,7 +1,7 @@
require 'log4r'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class HandleBoxImage
def initialize(app, env)
@@ -35,7 +35,7 @@ module VagrantPlugins
env[:box_volume_name] << '_vagrant_box_image.img'
# Don't continue if image already exists in storage pool.
- return @app.call(env) if Libvirt::Util::Collection.find_matching(
+ return @app.call(env) if ProviderLibvirt::Util::Collection.find_matching(
env[:libvirt_compute].volumes.all, env[:box_volume_name])
# Box is not available as a storage pool volume. Create and upload
@@ -97,7 +97,7 @@ module VagrantPlugins
stream = env[:libvirt_compute].client.stream
volume.upload(stream, offset=0, length=image_size)
- # Exception Libvirt::RetrieveError can be raised if buffer is
+ # Exception ProviderLibvirt::RetrieveError can be raised if buffer is
# longer than length accepted by API send function.
#
# TODO: How to find out if buffer is too large and what is the
diff --git a/lib/vagrant-libvirt/action/handle_storage_pool.rb b/lib/vagrant-libvirt/action/handle_storage_pool.rb
index b088d31..1776916 100644
--- a/lib/vagrant-libvirt/action/handle_storage_pool.rb
+++ b/lib/vagrant-libvirt/action/handle_storage_pool.rb
@@ -1,10 +1,10 @@
require 'log4r'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class HandleStoragePool
- include VagrantPlugins::Libvirt::Util::ErbTemplate
+ include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
def initialize(app, env)
@logger = Log4r::Logger.new("vagrant_libvirt::action::handle_storage_pool")
@@ -16,7 +16,7 @@ module VagrantPlugins
config = env[:machine].provider_config
# Check for storage pool, where box image should be created
- fog_pool = Libvirt::Util::Collection.find_matching(
+ fog_pool = ProviderLibvirt::Util::Collection.find_matching(
env[:libvirt_compute].pools.all, config.storage_pool_name)
return @app.call(env) if fog_pool
diff --git a/lib/vagrant-libvirt/action/is_created.rb b/lib/vagrant-libvirt/action/is_created.rb
index 39760a0..37fd81f 100644
--- a/lib/vagrant-libvirt/action/is_created.rb
+++ b/lib/vagrant-libvirt/action/is_created.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# This can be used with "Call" built-in to check if the machine
# is created and branch in the middleware.
diff --git a/lib/vagrant-libvirt/action/is_running.rb b/lib/vagrant-libvirt/action/is_running.rb
index a0bf4ec..f2d47e5 100644
--- a/lib/vagrant-libvirt/action/is_running.rb
+++ b/lib/vagrant-libvirt/action/is_running.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# This can be used with "Call" built-in to check if the machine
# is running and branch in the middleware.
diff --git a/lib/vagrant-libvirt/action/is_suspended.rb b/lib/vagrant-libvirt/action/is_suspended.rb
index 1162429..6bb3257 100644
--- a/lib/vagrant-libvirt/action/is_suspended.rb
+++ b/lib/vagrant-libvirt/action/is_suspended.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# This can be used with "Call" built-in to check if the machine
# is suspended and branch in the middleware.
diff --git a/lib/vagrant-libvirt/action/message_already_created.rb b/lib/vagrant-libvirt/action/message_already_created.rb
index a803d61..6a2d3da 100644
--- a/lib/vagrant-libvirt/action/message_already_created.rb
+++ b/lib/vagrant-libvirt/action/message_already_created.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class MessageAlreadyCreated
def initialize(app, env)
diff --git a/lib/vagrant-libvirt/action/message_not_created.rb b/lib/vagrant-libvirt/action/message_not_created.rb
index 14dfc0e..237c116 100644
--- a/lib/vagrant-libvirt/action/message_not_created.rb
+++ b/lib/vagrant-libvirt/action/message_not_created.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class MessageNotCreated
def initialize(app, env)
diff --git a/lib/vagrant-libvirt/action/message_not_running.rb b/lib/vagrant-libvirt/action/message_not_running.rb
index 2f8b977..665a861 100644
--- a/lib/vagrant-libvirt/action/message_not_running.rb
+++ b/lib/vagrant-libvirt/action/message_not_running.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class MessageNotRunning
def initialize(app, env)
diff --git a/lib/vagrant-libvirt/action/message_not_suspended.rb b/lib/vagrant-libvirt/action/message_not_suspended.rb
index 40654eb..8433de2 100644
--- a/lib/vagrant-libvirt/action/message_not_suspended.rb
+++ b/lib/vagrant-libvirt/action/message_not_suspended.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class MessageNotSuspended
def initialize(app, env)
diff --git a/lib/vagrant-libvirt/action/prepare_nfs_settings.rb b/lib/vagrant-libvirt/action/prepare_nfs_settings.rb
index f6ac990..75a2e75 100644
--- a/lib/vagrant-libvirt/action/prepare_nfs_settings.rb
+++ b/lib/vagrant-libvirt/action/prepare_nfs_settings.rb
@@ -1,6 +1,6 @@
require 'nokogiri'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class PrepareNFSSettings
def initialize(app,env)
diff --git a/lib/vagrant-libvirt/action/prune_nfs_exports.rb b/lib/vagrant-libvirt/action/prune_nfs_exports.rb
index 435a80e..9668db4 100644
--- a/lib/vagrant-libvirt/action/prune_nfs_exports.rb
+++ b/lib/vagrant-libvirt/action/prune_nfs_exports.rb
@@ -1,6 +1,6 @@
require 'yaml'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class PruneNFSExports
diff --git a/lib/vagrant-libvirt/action/read_ssh_info.rb b/lib/vagrant-libvirt/action/read_ssh_info.rb
index 62e3e0d..83edbb7 100644
--- a/lib/vagrant-libvirt/action/read_ssh_info.rb
+++ b/lib/vagrant-libvirt/action/read_ssh_info.rb
@@ -1,7 +1,7 @@
require "log4r"
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# This action reads the SSH info for the machine and puts it into the
# `:machine_ssh_info` key in the environment.
diff --git a/lib/vagrant-libvirt/action/read_state.rb b/lib/vagrant-libvirt/action/read_state.rb
index 0930205..696c42b 100644
--- a/lib/vagrant-libvirt/action/read_state.rb
+++ b/lib/vagrant-libvirt/action/read_state.rb
@@ -1,7 +1,7 @@
require "log4r"
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# This action reads the state of the machine and puts it in the
# `:machine_state_id` key in the environment.
diff --git a/lib/vagrant-libvirt/action/resume_domain.rb b/lib/vagrant-libvirt/action/resume_domain.rb
index 280b872..38a9810 100644
--- a/lib/vagrant-libvirt/action/resume_domain.rb
+++ b/lib/vagrant-libvirt/action/resume_domain.rb
@@ -1,7 +1,7 @@
require 'log4r'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Resume suspended domain.
class ResumeDomain
diff --git a/lib/vagrant-libvirt/action/set_name_of_domain.rb b/lib/vagrant-libvirt/action/set_name_of_domain.rb
index fa9c0ef..4edf359 100644
--- a/lib/vagrant-libvirt/action/set_name_of_domain.rb
+++ b/lib/vagrant-libvirt/action/set_name_of_domain.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Setup name for domain and domain volumes.
@@ -14,7 +14,7 @@ module VagrantPlugins
env[:domain_name] << "_#{Time.now.to_i}"
# Check if the domain name is not already taken
- domain = Libvirt::Util::Collection.find_matching(
+ domain = ProviderLibvirt::Util::Collection.find_matching(
env[:libvirt_compute].servers.all, env[:domain_name])
if domain != nil
raise Vagrant::Errors::DomainNameExists,
diff --git a/lib/vagrant-libvirt/action/share_folders.rb b/lib/vagrant-libvirt/action/share_folders.rb
index 285b4e7..e374295 100644
--- a/lib/vagrant-libvirt/action/share_folders.rb
+++ b/lib/vagrant-libvirt/action/share_folders.rb
@@ -3,7 +3,7 @@ require "pathname"
require "log4r"
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
class ShareFolders
def initialize(app, env)
diff --git a/lib/vagrant-libvirt/action/start_domain.rb b/lib/vagrant-libvirt/action/start_domain.rb
index 1b1ff2b..0d23d70 100644
--- a/lib/vagrant-libvirt/action/start_domain.rb
+++ b/lib/vagrant-libvirt/action/start_domain.rb
@@ -1,7 +1,7 @@
require 'log4r'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Just start the domain.
diff --git a/lib/vagrant-libvirt/action/suspend_domain.rb b/lib/vagrant-libvirt/action/suspend_domain.rb
index 0215ee6..a350cbc 100644
--- a/lib/vagrant-libvirt/action/suspend_domain.rb
+++ b/lib/vagrant-libvirt/action/suspend_domain.rb
@@ -1,7 +1,7 @@
require 'log4r'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Suspend domain.
class SuspendDomain
diff --git a/lib/vagrant-libvirt/action/sync_folders.rb b/lib/vagrant-libvirt/action/sync_folders.rb
index af5af7d..c4ded81 100644
--- a/lib/vagrant-libvirt/action/sync_folders.rb
+++ b/lib/vagrant-libvirt/action/sync_folders.rb
@@ -2,7 +2,7 @@ require "log4r"
require "vagrant/util/subprocess"
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# This middleware uses `rsync` to sync the folders over to the
# libvirt domain.
diff --git a/lib/vagrant-libvirt/action/timed_provision.rb b/lib/vagrant-libvirt/action/timed_provision.rb
index a7cd618..d4c83dd 100644
--- a/lib/vagrant-libvirt/action/timed_provision.rb
+++ b/lib/vagrant-libvirt/action/timed_provision.rb
@@ -1,7 +1,7 @@
require "vagrant-libvirt/util/timer"
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# This is the same as the builtin provision except it times the
# provisioner runs.
diff --git a/lib/vagrant-libvirt/action/wait_till_up.rb b/lib/vagrant-libvirt/action/wait_till_up.rb
index 9e3e158..0081b23 100644
--- a/lib/vagrant-libvirt/action/wait_till_up.rb
+++ b/lib/vagrant-libvirt/action/wait_till_up.rb
@@ -3,7 +3,7 @@ require 'vagrant-libvirt/util/timer'
require 'vagrant/util/retryable'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Action
# Wait till domain is started, till it obtains an IP address and is
diff --git a/lib/vagrant-libvirt/config.rb b/lib/vagrant-libvirt/config.rb
index a8a151f..55eb513 100644
--- a/lib/vagrant-libvirt/config.rb
+++ b/lib/vagrant-libvirt/config.rb
@@ -1,7 +1,7 @@
require 'vagrant'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
class Config < Vagrant.plugin('2', :config)
# A hypervisor name to access via Libvirt.
attr_accessor :driver
diff --git a/lib/vagrant-libvirt/errors.rb b/lib/vagrant-libvirt/errors.rb
index 322bf6a..cfe660f 100644
--- a/lib/vagrant-libvirt/errors.rb
+++ b/lib/vagrant-libvirt/errors.rb
@@ -1,7 +1,7 @@
require 'vagrant'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Errors
class VagrantLibvirtError < Vagrant::Errors::VagrantError
error_namespace("vagrant_libvirt.errors")
diff --git a/lib/vagrant-libvirt/plugin.rb b/lib/vagrant-libvirt/plugin.rb
index fbe162c..8058167 100644
--- a/lib/vagrant-libvirt/plugin.rb
+++ b/lib/vagrant-libvirt/plugin.rb
@@ -12,7 +12,7 @@ if Vagrant::VERSION < '1.1.0'
end
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
class Plugin < Vagrant.plugin('2')
name "libvirt"
description <<-DESC
diff --git a/lib/vagrant-libvirt/provider.rb b/lib/vagrant-libvirt/provider.rb
index 451ee50..bb9eb27 100644
--- a/lib/vagrant-libvirt/provider.rb
+++ b/lib/vagrant-libvirt/provider.rb
@@ -1,7 +1,7 @@
require 'vagrant'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
# This is the base class for a provider for the V2 API. A provider
# is responsible for creating compute resources to match the
diff --git a/lib/vagrant-libvirt/util.rb b/lib/vagrant-libvirt/util.rb
index 3f4cc47..a64251e 100644
--- a/lib/vagrant-libvirt/util.rb
+++ b/lib/vagrant-libvirt/util.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Util
autoload :ErbTemplate, 'vagrant-libvirt/util/erb_template'
autoload :Collection, 'vagrant-libvirt/util/collection'
diff --git a/lib/vagrant-libvirt/util/collection.rb b/lib/vagrant-libvirt/util/collection.rb
index 89d901e..43a52b1 100644
--- a/lib/vagrant-libvirt/util/collection.rb
+++ b/lib/vagrant-libvirt/util/collection.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Util
module Collection
diff --git a/lib/vagrant-libvirt/util/erb_template.rb b/lib/vagrant-libvirt/util/erb_template.rb
index 4f2b4be..2191fc6 100644
--- a/lib/vagrant-libvirt/util/erb_template.rb
+++ b/lib/vagrant-libvirt/util/erb_template.rb
@@ -1,7 +1,7 @@
require 'erb'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Util
module ErbTemplate
diff --git a/lib/vagrant-libvirt/util/libvirt_util.rb b/lib/vagrant-libvirt/util/libvirt_util.rb
index 907b4e3..1aaa183 100644
--- a/lib/vagrant-libvirt/util/libvirt_util.rb
+++ b/lib/vagrant-libvirt/util/libvirt_util.rb
@@ -2,7 +2,7 @@ require 'nokogiri'
require 'vagrant/util/network_ip'
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Util
module LibvirtUtil
include Vagrant::Util::NetworkIP
diff --git a/lib/vagrant-libvirt/util/timer.rb b/lib/vagrant-libvirt/util/timer.rb
index 6349d49..8fba186 100644
--- a/lib/vagrant-libvirt/util/timer.rb
+++ b/lib/vagrant-libvirt/util/timer.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
module Util
class Timer
# A basic utility method that times the execution of the given
diff --git a/lib/vagrant-libvirt/version.rb b/lib/vagrant-libvirt/version.rb
index addb8f0..666f9d9 100644
--- a/lib/vagrant-libvirt/version.rb
+++ b/lib/vagrant-libvirt/version.rb
@@ -1,5 +1,5 @@
module VagrantPlugins
- module Libvirt
+ module ProviderLibvirt
VERSION = "0.0.6"
end
end
diff --git a/vagrant-libvirt.gemspec b/vagrant-libvirt.gemspec
index 53f2c8a..311906d 100644
--- a/vagrant-libvirt.gemspec
+++ b/vagrant-libvirt.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.name = "vagrant-libvirt"
gem.require_paths = ["lib"]
- gem.version = VagrantPlugins::Libvirt::VERSION
+ gem.version = VagrantPlugins::ProviderLibvirt::VERSION
gem.add_runtime_dependency "fog", "~> 1.10.0"
gem.add_runtime_dependency "ruby-libvirt", "~> 0.4.0"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git
More information about the Pkg-ruby-extras-commits
mailing list