diff --git a/provisioner/converge/provisioner.go b/provisioner/converge/provisioner.go index 07ef4f6c7..e58675008 100644 --- a/provisioner/converge/provisioner.go +++ b/provisioner/converge/provisioner.go @@ -23,7 +23,7 @@ type Config struct { common.PackerConfig `mapstructure:",squash"` // Bootstrapping - SkipBootstrap bool `mapstructure:"skip_bootstrap"` + Bootstrap bool `mapstructure:"bootstrap"` Version string `mapstructure:"version"` BootstrapCommand string `mapstructure:"bootstrap_command"` @@ -126,7 +126,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { } func (p *Provisioner) maybeBootstrap(ui packer.Ui, comm packer.Communicator) error { - if p.config.SkipBootstrap { + if !p.config.Bootstrap { return nil } ui.Message("bootstrapping converge") @@ -210,7 +210,7 @@ func (p *Provisioner) applyModules(ui packer.Ui, comm packer.Communicator) error cmd.Wait() if cmd.ExitStatus == 127 { ui.Error("Could not find Converge. Is it installed and in PATH?") - if p.config.SkipBootstrap { + if !p.config.Bootstrap { ui.Error("Bootstrapping was disabled for this run. That might be why Converge isn't present.") } diff --git a/website/source/docs/provisioners/converge.html.md b/website/source/docs/provisioners/converge.html.md index 8ec101b33..cdef6b5a4 100644 --- a/website/source/docs/provisioners/converge.html.md +++ b/website/source/docs/provisioners/converge.html.md @@ -39,9 +39,9 @@ required element is "module". Every other option is optional. Optional parameters: -- `skip_bootstrap` (boolean) - If unset or `false`, the provisioner will - download the latest Converge bootstrap script and the specified `version` of - Converge from the internet. +- `bootstrap` (boolean) - Set to allow the provisioner to download the latest + Converge bootstrap script and the specified `version` of Converge from the + internet. - `version` (string) - Set to a [released Converge version](https://github.com/asteris-llc/converge/releases) for bootstrap.