lib/chef_metal.rb in chef-metal-0.13 vs lib/chef_metal.rb in chef-metal-0.14
- old
+ new
@@ -69,12 +69,16 @@
driver_class.from_url(canonicalized_url, config)
end
def self.connect_to_machine(machine_spec, config = Cheffish.profiled_config)
+ chef_server = Cheffish.default_chef_server(config)
+ if machine_spec.is_a?(String)
+ machine_spec = ChefMachineSpec.get(machine_spec, chef_server)
+ end
driver = driver_for_url(machine_spec.driver_url, config)
if driver
- machine_options = { :convergence_options => { :chef_server => Cheffish.default_chef_server(config) } }
+ machine_options = { :convergence_options => { :chef_server => chef_server } }
machine_options = Cheffish::MergedConfig.new(config[:machine_options], machine_options) if config[:machine_options]
driver.connect_to_machine(machine_spec, machine_options)
else
nil
end