lib/vagrant-rimu/actions/create.rb in vagrant-rimu-0.0.4 vs lib/vagrant-rimu/actions/create.rb in vagrant-rimu-0.0.5
- old
+ new
@@ -1,15 +1,17 @@
require 'log4r'
require 'vagrant'
+require 'vagrant-rimu/actions/ssh_utils'
require 'vagrant-rimu/actions/abstract_action'
module VagrantPlugins
module Rimu
module Actions
class Create < AbstractAction
include Vagrant::Util::Retryable
+ include VagrantPlugins::Rimu::Actions::SshUtils
def initialize(app, env)
@app = app
@machine = env[:machine]
@logger = Log4r::Logger.new('vagrant::rimu::create')
@@ -73,12 +75,16 @@
@machine.config.ssh.password = root_pass
end
if params.has_key?(:instantiation_options)
retryable(:tries => 120, :sleep => 10) do
next if env[:interrupted]
- raise 'not ready' if !@machine.communicate.ready?
+ raise 'not ready' unless @machine.communicate.ready?
end
end
+
+ # upload root ssh key
+ upload_key(env)
+
@machine.config.ssh.username = user
@app.call(env)
end
# rubocop:enable Metrics/AbcSize