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

provisioner(converge): reverse the meaning of bootstrap

Browse Source
This commit is contained in:
Brian Hicks 2016-12-27 12:24:06 -06:00
parent b8849a9c2d
commit 73252b9a9b
No known key found for this signature in database
GPG Key ID: FF1F407C0D3C2430
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
provisioner/converge/provisioner.go
View File

@ -29,8 +29,8 @@ type Config struct {
common.PackerConfig `mapstructure:",squash"`
// Bootstrapping
NoBootstrap bool `mapstructure:"no_bootstrap"`
Version string `mapstructure:"version"`
Bootstrap bool `mapstructure:"bootstrap"`
Version string `mapstructure:"version"`
// Modules
ModuleDirs []ModuleDir `mapstructure:"module_dirs"`
@ -131,7 +131,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.NoBootstrap {
if !p.config.Bootstrap {
return nil
}
ui.Message("bootstrapping converge")
@ -188,7 +188,7 @@ func (p *Provisioner) checkVersion(ui packer.Ui, comm packer.Communicator) error
cmd.Wait()
if cmd.ExitStatus == 127 {
ui.Error("Could not determine Converge version. Is it installed and in PATH?")
if p.config.NoBootstrap {
if !p.config.Bootstrap {
ui.Error("Bootstrapping was disabled for this run. That might be why Converge isn't present.")
}