NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'virtfs' of github.com:teto/vagrant-libvirt into virtfs

Browse Source
This commit is contained in:
Matthieu Coudron 2014-03-16 11:38:21 +01:00
commit 8d4f16a3f8
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/vagrant-libvirt/action.rb
View File

@ -27,6 +27,7 @@ module VagrantPlugins
b2.use CreateNetworks b2.use CreateNetworks
b2.use CreateNetworkInterfaces b2.use CreateNetworkInterfaces
b2.use PrepareNFSValidIds b2.use PrepareNFSValidIds
b2.use SyncedFolderCleanup b2.use SyncedFolderCleanup
b2.use SyncedFolders b2.use SyncedFolders
@ -34,12 +35,15 @@ module VagrantPlugins
b2.use StartDomain b2.use StartDomain
b2.use WaitTillUp b2.use WaitTillUp
b2.use StartDomain
b2.use WaitTillUp
b2.use ForwardPorts b2.use ForwardPorts
b2.use PrepareNFSSettings # b2.use PrepareNFSSettings
b2.use ShareFolders b2.use ShareFolders
b2.use SetHostname b2.use SetHostname
# b2.use SyncFolders # b2.use SyncFolders
@ -73,7 +77,6 @@ module VagrantPlugins
# Ensure networks are created and active # Ensure networks are created and active
b3.use CreateNetworks b3.use CreateNetworks
b3.use PrepareNFSValidIds b3.use PrepareNFSValidIds
b3.use SyncedFolderCleanup b3.use SyncedFolderCleanup
b3.use SyncedFolders b3.use SyncedFolders
@ -88,7 +91,7 @@ module VagrantPlugins
b3.use ForwardPorts b3.use ForwardPorts
b3.use PrepareNFSSettings # b3.use PrepareNFSSettings
b3.use ShareFolders b3.use ShareFolders
end end
@ -153,7 +156,7 @@ module VagrantPlugins
b2.use ConnectLibvirt b2.use ConnectLibvirt
b2.use ClearForwardedPorts b2.use ClearForwardedPorts
b2.use PruneNFSExports # b2.use PruneNFSExports
b2.use DestroyDomain b2.use DestroyDomain
b2.use DestroyNetworks b2.use DestroyNetworks
end end
@ -318,8 +321,11 @@ module VagrantPlugins
autoload :MessageNotCreated, action_root.join('message_not_created') autoload :MessageNotCreated, action_root.join('message_not_created')
autoload :MessageNotRunning, action_root.join('message_not_running') autoload :MessageNotRunning, action_root.join('message_not_running')
autoload :MessageNotSuspended, action_root.join('message_not_suspended') autoload :MessageNotSuspended, action_root.join('message_not_suspended')
autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings') autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings')
autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
autoload :PruneNFSExports, action_root.join('prune_nfs_exports') autoload :PruneNFSExports, action_root.join('prune_nfs_exports')
autoload :ReadSSHInfo, action_root.join('read_ssh_info') autoload :ReadSSHInfo, action_root.join('read_ssh_info')
autoload :ReadState, action_root.join('read_state') autoload :ReadState, action_root.join('read_state')
autoload :ResumeDomain, action_root.join('resume_domain') autoload :ResumeDomain, action_root.join('resume_domain')
@ -330,6 +336,7 @@ module VagrantPlugins
autoload :StartDomain, action_root.join('start_domain') autoload :StartDomain, action_root.join('start_domain')
autoload :SuspendDomain, action_root.join('suspend_domain') autoload :SuspendDomain, action_root.join('suspend_domain')
autoload :TimedProvision, action_root.join('timed_provision') autoload :TimedProvision, action_root.join('timed_provision')
autoload :WaitTillUp, action_root.join('wait_till_up') autoload :WaitTillUp, action_root.join('wait_till_up')
autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids') autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')