diff --git a/lib/vagrant/action/builtin/cloud_init_setup.rb b/lib/vagrant/action/builtin/cloud_init_setup.rb index 6674eb05d..9a30d1488 100644 --- a/lib/vagrant/action/builtin/cloud_init_setup.rb +++ b/lib/vagrant/action/builtin/cloud_init_setup.rb @@ -98,10 +98,9 @@ module Vagrant File.open("#{source_dir}/meta-data", 'w') { |file| file.write(meta_data.to_s) } - iso_path = env[:env].host.capability(:create_iso, env[:env], + iso_path = env[:env].host.capability(:create_iso, source_dir, volume_id: "cidata") - - attach_disk_config(machine, env, iso_path) + attach_disk_config(machine, env, iso_path.to_path) ensure FileUtils.remove_entry(source_dir) end diff --git a/test/unit/vagrant/action/builtin/cloud_init_setup_test.rb b/test/unit/vagrant/action/builtin/cloud_init_setup_test.rb index f5fb89f48..8607e5dee 100644 --- a/test/unit/vagrant/action/builtin/cloud_init_setup_test.rb +++ b/test/unit/vagrant/action/builtin/cloud_init_setup_test.rb @@ -106,7 +106,7 @@ describe Vagrant::Action::Builtin::CloudInitSetup do expect(File).to receive(:open).with("#{source_dir}/user-data", 'w').and_return(true) expect(File).to receive(:open).with("#{source_dir}/meta-data", 'w').and_return(true) expect(FileUtils).to receive(:remove_entry).with(source_dir).and_return(true) - allow(host).to receive(:capability).with(:create_iso, machine_env, source_dir, volume_id: "cidata").and_return(iso_path) + allow(host).to receive(:capability).with(:create_iso, source_dir, volume_id: "cidata").and_return(iso_path) expect(vm.disks).to receive(:each) subject.write_cfg_iso(machine, env, message, {})