From 18425c45d0b97c977b938afe6da45a9448f4f005 Mon Sep 17 00:00:00 2001
From: Brian Hicks <brian@brianthicks.com>
Date: Wed, 28 Dec 2016 08:48:02 -0600
Subject: [PATCH] provisioner(converge): change bootstrap to skip_bootstrap

---
 provisioner/converge/provisioner.go               | 6 +++---
 provisioner/converge/provisioner_test.go          | 2 --
 website/source/docs/provisioners/converge.html.md | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/provisioner/converge/provisioner.go b/provisioner/converge/provisioner.go
index daaf484d2..4f0897e76 100644
--- a/provisioner/converge/provisioner.go
+++ b/provisioner/converge/provisioner.go
@@ -27,7 +27,7 @@ type Config struct {
 	common.PackerConfig `mapstructure:",squash"`
 
 	// Bootstrapping
-	Bootstrap        bool   `mapstructure:"bootstrap"`
+	SkipBootstrap    bool   `mapstructure:"skip_bootstrap"`
 	Version          string `mapstructure:"version"`
 	BootstrapCommand string `mapstructure:"bootstrap_command"`
 
@@ -135,7 +135,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.Bootstrap {
+	if p.config.SkipBootstrap {
 		return nil
 	}
 	ui.Message("bootstrapping converge")
@@ -219,7 +219,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.Bootstrap {
+		if p.config.SkipBootstrap {
 			ui.Error("Bootstrapping was disabled for this run. That might be why Converge isn't present.")
 		}
 
diff --git a/provisioner/converge/provisioner_test.go b/provisioner/converge/provisioner_test.go
index 7c97982ae..337cc60db 100644
--- a/provisioner/converge/provisioner_test.go
+++ b/provisioner/converge/provisioner_test.go
@@ -9,8 +9,6 @@ import (
 
 func testConfig() map[string]interface{} {
 	return map[string]interface{}{
-		"bootstrap": false,
-		"version":   "",
 		"module_dirs": []map[string]interface{}{
 			{
 				"source":      "from",
diff --git a/website/source/docs/provisioners/converge.html.md b/website/source/docs/provisioners/converge.html.md
index cdef6b5a4..8ec101b33 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:
 
-- `bootstrap` (boolean) - Set to allow the provisioner to download the latest
-  Converge bootstrap script and the specified `version` of Converge from the
-  internet.
+- `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.
 
 - `version` (string) - Set to a [released Converge version](https://github.com/asteris-llc/converge/releases) for bootstrap.