Skip to content

Commit

Permalink
Switch to WaitForCommunicator
Browse files Browse the repository at this point in the history
The OpenStack provider's action_up used a custom WaitForServerToBeAccessible
action to poll instances via SSH in order to determine when the VM is up and
running. One large shortcoming of this custom implementation is that it does
not support communicators other than SSH, notably WinRM. This patch replaces
the WaitForServerToBeAccessible with the built-in WaitForCommunicator action
which has been part of Vagrant since v1.3 and is able to handle multiple
communicators.

Fixes ggiamarchi#264.
Closes ggiamarchi#227.
  • Loading branch information
Sharpie committed Jul 31, 2016
1 parent 0282ad9 commit 300f9a7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 130 deletions.
3 changes: 1 addition & 2 deletions source/lib/vagrant-openstack-provider/action.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def self.action_up
b2.use CreateStack
b2.use CreateServer
b2.use Message, I18n.t('vagrant_openstack.ssh_disabled_provisioning') if ssh_disabled
b2.use WaitForServerToBeAccessible unless ssh_disabled
b2.use WaitForCommunicator unless ssh_disabled
when :shutoff
b2.use StartServer
when :suspended
Expand Down Expand Up @@ -216,7 +216,6 @@ def self.action_reload
autoload :ProvisionWrapper, action_root.join('provision')
autoload :WaitForServerToStop, action_root.join('wait_stop')
autoload :WaitForServerToBeActive, action_root.join('wait_active')
autoload :WaitForServerToBeAccessible, action_root.join('wait_accessible')

private

Expand Down
61 changes: 0 additions & 61 deletions source/lib/vagrant-openstack-provider/action/wait_accessible.rb

This file was deleted.

This file was deleted.

0 comments on commit 300f9a7

Please sign in to comment.