Merge pull request #3 from akurz/fix-remote-ssh-commands

Fix remote ssh commands
Mwea · Sep 2, 2018 · 52343c9 · 52343c9
2 parents 61f6a3e + 5d4e76e
commit 52343c9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/chefsolo/provisioner_config.go b/chefsolo/provisioner_config.go
@@ -115,9 +115,10 @@ func Provisioner() terraform.ResourceProvisioner {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-			"recreate_client": {
+			"skip_install": {
 				Type:     schema.TypeBool,
 				Optional: true,
+				Default:  false,
 			},
 			"prevent_sudo": {
 				Type:     schema.TypeBool,
@@ -178,6 +179,7 @@ func configureProvisioner(d *schema.ResourceData, osType afero.Fs) (*provisioner
 		ClientOptions:    getStringList(d.Get("client_options")),
 		Environment:      d.Get("environment").(string),
 		UsePolicyfile:    d.Get("use_policyfile").(bool),
+		SkipInstall:      d.Get("skip_install").(bool),
 		HTTPProxy:        d.Get("http_proxy").(string),
 		HTTPSProxy:       d.Get("https_proxy").(string),
 		NOProxy:          getStringList(d.Get("no_proxy")),

diff --git a/chefsolo/provisioner_utils.go b/chefsolo/provisioner_utils.go
@@ -42,6 +42,12 @@ func getCommunicator(ctx context.Context, o terraform.UIOutput, s *terraform.Ins
 	if err != nil {
 		return nil, err
 	}
-	defer comm.Disconnect()
+
+	// Wait for the context to end and then disconnect
+	go func() {
+		<-ctx.Done()
+		comm.Disconnect()
+	}()
+
 	return comm, err
 }