diff --git a/lib/vagrant/action/builtin/cloud_init_setup.rb b/lib/vagrant/action/builtin/cloud_init_setup.rb index dad5665b6..e44309b6f 100644 --- a/lib/vagrant/action/builtin/cloud_init_setup.rb +++ b/lib/vagrant/action/builtin/cloud_init_setup.rb @@ -100,7 +100,8 @@ module Vagrant metadata = { "instance-id": "i-#{machine.id.split('-').join}" } File.open("#{source_dir}/meta-data", 'w') { |file| file.write(metadata.to_s) } - iso_path = env[:env].host.capability(:create_iso, env[:env], source_dir) + iso_path = env[:env].host.capability(:create_iso, env[:env], + source_dir, volume_id: "cidata") 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 00628e97a..3e2911b6a 100644 --- a/test/unit/vagrant/action/builtin/cloud_init_setup_test.rb +++ b/test/unit/vagrant/action/builtin/cloud_init_setup_test.rb @@ -111,7 +111,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).and_return(iso_path) + allow(host).to receive(:capability).with(:create_iso, machine_env, source_dir, volume_id: "cidata").and_return(iso_path) subject.write_cfg_iso(machine, env, message) end