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

rename variable; add docs

This commit is contained in:
Kostas 2020-10-01 09:01:51 +03:00
parent 72166febee
commit 18c4f271ac
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/oracle/oci/config.go
View File

@ -77,7 +77,7 @@ type Config struct {
InstanceTags map[string]string `mapstructure:"instance_tags"` InstanceTags map[string]string `mapstructure:"instance_tags"`
InstanceDefinedTags map[string]map[string]interface{} `mapstructure:"instance_defined_tags"` InstanceDefinedTags map[string]map[string]interface{} `mapstructure:"instance_defined_tags"`
Shape string `mapstructure:"shape"` Shape string `mapstructure:"shape"`
BootVolumeSizeInGBs int64 `mapstructure:"boot_volume_size_in_gbs"` BootVolumeSizeInGBs int64 `mapstructure:"disk_size"`
// Metadata optionally contains custom metadata key/value pairs provided in the // Metadata optionally contains custom metadata key/value pairs provided in the
// configuration. While this can be used to set metadata["user_data"] the explicit // configuration. While this can be used to set metadata["user_data"] the explicit
@ -333,7 +333,7 @@ func (c *Config) Prepare(raws ...interface{}) error {
c.BootVolumeSizeInGBs = 50 c.BootVolumeSizeInGBs = 50
} else if c.BootVolumeSizeInGBs < 50 || c.BootVolumeSizeInGBs > 16384 { } else if c.BootVolumeSizeInGBs < 50 || c.BootVolumeSizeInGBs > 16384 {
errs = packer.MultiErrorAppend( errs = packer.MultiErrorAppend(
errs, errors.New("'boot_volume_size_in_gbs' must be between 50 and 16384 GBs")) errs, errors.New("'disk_size' must be between 50 and 16384 GBs"))
} }
if errs != nil && len(errs.Errors) > 0 { if errs != nil && len(errs.Errors) > 0 {

4
builder/oracle/oci/config_test.go
View File

@ -44,8 +44,8 @@ func testConfig(accessConfFile *os.File) map[string]interface{} {
"create_vnic_details": map[string]interface{}{ "create_vnic_details": map[string]interface{}{
"nsg_ids": []string{"ocd1..."}, "nsg_ids": []string{"ocd1..."},
}, },
"shape": "VM.Standard1.1", "shape": "VM.Standard1.1",
"boot_volume_size_in_gbs": 60, "disk_size": 60,
} }
} }

4
website/pages/docs/builders/oracle/oci.mdx
View File

@ -153,6 +153,10 @@ can also be supplied to override the typical auto-generated key:
[the Oracle docs](https://docs.cloud.oracle.com/en-us/iaas/Content/Network/Tasks/managingVNICs.htm) [the Oracle docs](https://docs.cloud.oracle.com/en-us/iaas/Content/Network/Tasks/managingVNICs.htm)
for more information about VNICs. for more information about VNICs.
- `disk_size` (int64) - The size of the boot volume in GBs. Minimum value is 50 and maximum value is 16384 (16TB).
Sets the [BootVolumeSizeInGBs](https://godoc.org/github.com/oracle/oci-go-sdk/core#InstanceConfigurationInstanceSourceViaImageDetails)
when launching the instance. Defaults to `50`.
- `use_private_ip` (boolean) - Use private ip addresses to connect to the - `use_private_ip` (boolean) - Use private ip addresses to connect to the
instance via ssh. instance via ssh.