iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into scrape_doc_to_builder_struct_config

This commit is contained in:
Adrien Delorme 2019-09-20 14:46:26 +02:00
parent 3fe9d52e3f 271a3e5814
commit 299544a4c7
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/hyperv/iso/builder.go
View File

@ -66,7 +66,7 @@ type Config struct {
DiskSize uint `mapstructure:"disk_size" required:"false"` DiskSize uint `mapstructure:"disk_size" required:"false"`
// The block size of the VHD to be created. // The block size of the VHD to be created.
// Recommended disk block size for Linux hyper-v guests is 1 MiB. This // Recommended disk block size for Linux hyper-v guests is 1 MiB. This
// defaults to "32 MiB". // defaults to "32" MiB.
DiskBlockSize uint `mapstructure:"disk_block_size" required:"false"` DiskBlockSize uint `mapstructure:"disk_block_size" required:"false"`
// The amount, in megabytes, of RAM to assign to the // The amount, in megabytes, of RAM to assign to the
// VM. By default, this is 1 GB. // VM. By default, this is 1 GB.

10
common/iso_config_test.go
View File

@ -164,7 +164,15 @@ func TestISOConfigPrepare_ISOUrl(t *testing.T) {
i.RawSingleISOUrl = "" i.RawSingleISOUrl = ""
i.ISOChecksum = "" i.ISOChecksum = ""
i.ISOChecksumURL = ts.URL + "/basic.txt" i.ISOChecksumURL = ts.URL + "/basic.txt"
warns, err = i.Prepare(nil) // ISOConfig.Prepare() returns a slice of errors
var errs []error
warns, errs = i.Prepare(nil)
if len(warns) > 0 {
t.Fatalf("expected no warnings, got:%v", warns)
}
if len(errs) < 1 || err[0] == nil {
t.Fatalf("expected a populated error slice, got: %v", errs)
}
// Test iso_url set // Test iso_url set
i = testISOConfig() i = testISOConfig()

2
website/source/partials/builder/hyperv/iso/_Config-not-required.html.md
View File

@ -5,7 +5,7 @@
- `disk_block_size` (uint) - The block size of the VHD to be created. - `disk_block_size` (uint) - The block size of the VHD to be created.
Recommended disk block size for Linux hyper-v guests is 1 MiB. This Recommended disk block size for Linux hyper-v guests is 1 MiB. This
defaults to "32 MiB". defaults to "32" MiB.
- `memory` (uint) - The amount, in megabytes, of RAM to assign to the - `memory` (uint) - The amount, in megabytes, of RAM to assign to the
VM. By default, this is 1 GB. VM. By default, this is 1 GB.