Skip to content

Commit

Permalink
Merge pull request #282 from Sharpie/dont-lock-for-ssh
Browse files Browse the repository at this point in the history
Allow status and ssh to run without a lock
  • Loading branch information
ggiamarchi committed Apr 15, 2016
2 parents 70aabcc + 44e4cce commit 7a5d972
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions source/lib/vagrant-openstack-provider/provider.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ def ssh_info
# Run a custom action called "read_ssh_info" which does what it
# says and puts the resulting SSH info into the `:machine_ssh_info`
# key in the environment.
env = @machine.action('read_ssh_info')
env = @machine.action('read_ssh_info', lock: false)
env[:machine_ssh_info]
end

def state
# Run a custom action we define called "read_state" which does
# what it says. It puts the state in the `:machine_state_id`
# key in the environment.
env = @machine.action('read_state')
env = @machine.action('read_state', lock: false)

state_id = env[:machine_state_id]

Expand Down

0 comments on commit 7a5d972

Please sign in to comment.