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

make default for wait address to be any ipv4 address. add some better documentation

This commit is contained in:
Joshua Foster 2020-06-04 22:27:59 -04:00
parent 27a1ceef6d
commit 90463e5394
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builder/vsphere/common/step_wait_for_ip.go
View File

@ -28,9 +28,13 @@ type WaitIpConfig struct {
// [ParseDuration](https://golang.org/pkg/time/#ParseDuration) documentation
// for full details.
SettleTimeout time.Duration `mapstructure:"ip_settle_timeout"`
// Set this to a CIDR address. This will cause the service to wait for an address that is contained in
// this network. Use "0.0.0.0/0" to wait for any ipv4 address.
WaitAddress string `mapstructure:"ip_wait_address"`
// Set this to a CIDR address to cause the service to wait for an address that is contained in
// this network range. Defaults to "0.0.0.0/0" for any ipv4 address. Examples include:
//
// * empty string ("") - remove all filters
// * "0:0:0:0:0:0:0:0/0" - allow only ipv6 addresses
// * "192.168.1.0/24 - only allow ipv4 addresses from 192.168.1.1 to 192.168.1.254
WaitAddress *string `mapstructure:"ip_wait_address"`
ipnet *net.IPNet
// WaitTimeout is a total timeout, so even if VM changes IP frequently and it doesn't settle down we will end waiting.
@ -49,10 +53,14 @@ func (c *WaitIpConfig) Prepare() []error {
if c.WaitTimeout == 0 {
c.WaitTimeout = 30 * time.Minute
}
if c.WaitAddress == nil {
addr := "0.0.0.0/0"
c.WaitAddress = &addr
}
if c.WaitAddress != "" {
if *c.WaitAddress != "" {
var err error
_, c.ipnet, err = net.ParseCIDR(c.WaitAddress)
_, c.ipnet, err = net.ParseCIDR(*c.WaitAddress)
if err != nil {
errs = append(errs, fmt.Errorf("unable to parse \"ip_wait_address\": %w", err))
}

8
website/pages/partials/builder/vsphere/common/WaitIpConfig-not-required.mdx
View File

@ -12,6 +12,10 @@
[ParseDuration](https://golang.org/pkg/time/#ParseDuration) documentation
for full details.
- `ip_wait_address` (string) - Set this to a CIDR address. This will cause the service to wait for an address that is contained in
this network. Use "0.0.0.0/0" to wait for any ipv4 address.
- `ip_wait_address` (\*string) - Set this to a CIDR address to cause the service to wait for an address that is contained in
this network range. Defaults to "0.0.0.0/0" for any ipv4 address. Examples include:
* empty string ("") - remove all filters
* "0:0:0:0:0:0:0:0/0" - allow only ipv6 addresses
* "192.168.1.0/24 - only allow ipv4 addresses from 192.168.1.1 to 192.168.1.254