зеркало из https://github.com/Azure/vagrant-azure.git
Few minor fixes.
This commit is contained in:
Родитель
837ff9fe7d
Коммит
87a57056c7
|
@ -158,7 +158,7 @@ module VagrantPlugins
|
|||
def self.action_prepare_boot
|
||||
Vagrant::Action::Builder.new.tap do |b|
|
||||
b.use Provision
|
||||
b.use SyncFolders
|
||||
# b.use SyncFolders
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -173,7 +173,8 @@ module VagrantPlugins
|
|||
if !env1[:result]
|
||||
b1.use Call, IsState, :StoppedDeallocated do |env2, b2|
|
||||
if env2[:result]
|
||||
b2.use action_prepare_boot
|
||||
# b2.use action_prepare_boot
|
||||
b2.use Provision
|
||||
b2.use StartInstance # start this instance again
|
||||
b2.use Call, WaitForState, :ReadyRole do |env3, b3|
|
||||
if env3[:result]
|
||||
|
@ -182,6 +183,7 @@ module VagrantPlugins
|
|||
'vagrant_azure.vm_started', :name => $`
|
||||
)
|
||||
b3.use WaitForCommunicate
|
||||
b3.use SyncFolders
|
||||
end
|
||||
end
|
||||
else
|
||||
|
@ -191,8 +193,9 @@ module VagrantPlugins
|
|||
end
|
||||
end
|
||||
else
|
||||
b1.use action_prepare_boot
|
||||
b1.use Provision
|
||||
b1.use RunInstance # Launch a new instance
|
||||
b1.use SyncFolders
|
||||
b1.use Call, WaitForState, :ReadyRole do |env2, b2|
|
||||
if env2[:result]
|
||||
env2[:machine].id =~ /@/
|
||||
|
|
|
@ -11,7 +11,7 @@ module Vagrant
|
|||
def communicate
|
||||
unless @communicator
|
||||
if @config.vm.guest == :windows
|
||||
@communicator = VagrantPlugins::VagrantHyperV::Communicator::PowerShell.new(self)
|
||||
@communicator = VagrantPlugins::WinAzure::Communicator::PowerShell.new(self)
|
||||
else
|
||||
@communicator = original_communicate
|
||||
end
|
||||
|
|
Загрузка…
Ссылка в новой задаче