beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include volume_id in iso host cap params

Browse Source
This commit is contained in:
Brian Cain 2020-06-18 11:09:21 -07:00
parent 39a12de38f
commit d6fc70dd68
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/vagrant/action/builtin/cloud_init_setup.rb
View File

@ -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

2
test/unit/vagrant/action/builtin/cloud_init_setup_test.rb
View File

@ -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