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

Remove duplicate actions for up and start (#1410)

Browse Source 
Consolidate actions around starting the VM into a single place, and
re-order the call to the CreateNetworkInterfaces to allow it to be used
during initial bring up without needing to duplicate the remaining start
actions in the up process.
This commit is contained in:
Darragh Bailey
2021-11-29 13:27:57 +00:00
committed by GitHub
parent 0c7db1a766
commit d87fabe777
1 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,35 +31,24 @@ module VagrantPlugins
b2.use CreateDomain
b2.use CreateNetworks
b2.use CreateNetworkInterfaces
b2.use SetBootOrder
b2.use StartDomain
b2.use action_start
else
b2.use HandleStoragePool
b2.use HandleBox
b2.use HandleBoxImage
b2.use CreateDomainVolume
b2.use CreateDomain
b2.use Provision
b2.use PrepareNFSValidIds
b2.use SyncedFolderCleanup
b2.use SyncedFolders
b2.use PrepareNFSSettings
b2.use ShareFolders
b2.use CreateNetworks
b2.use CreateNetworkInterfaces
b2.use SetBootOrder
b2.use StartDomain
b2.use WaitTillUp
b2.use WaitForCommunicator, [:running]
b2.use action_start
b2.use ForwardPorts
b2.use SetHostname
# b2.use SyncFolders
end
else
env[:halt_on_error] = true
b2.use CreateNetworks
b2.use action_start
end
end
@@ -82,28 +71,25 @@ module VagrantPlugins
b2.use Call, IsSuspended do |env2, b3|
# if vm is suspended resume it then exit
if env2[:result]
b3.use CreateNetworks
b3.use ResumeDomain
next
end
if !env[:machine].config.vm.box
# With no box, we just care about network creation and starting it
b3.use CreateNetworks
b3.use SetBootOrder
b3.use StartDomain
else
# VM is not running or suspended.
b3.use Provision
# Ensure networks are created and active
b3.use CreateNetworks
b3.use SetBootOrder
b3.use PrepareNFSValidIds
b3.use SyncedFolderCleanup
b3.use SyncedFolders
b3.use PrepareNFSSettings
b3.use ShareFolders
b3.use SetBootOrder
# Start it..
b3.use StartDomain
@@ -114,8 +100,6 @@ module VagrantPlugins
b3.use WaitForCommunicator, [:running]
b3.use ForwardPorts
b3.use PrepareNFSSettings
b3.use ShareFolders
end
end
end
@@ -264,7 +248,6 @@ module VagrantPlugins
end
b3.use Provision
# b3.use SyncFolders
end
end
end