From eb51f3c8424083bd1360d0c35c183edadf5eec2e Mon Sep 17 00:00:00 2001
From: Alex Harvey <alexharv074@gmail.com>
Date: Fri, 11 Oct 2019 23:11:03 +1100
Subject: [PATCH] Some minor cleanup in Puppet provisioner

---
 builtin/provisioners/puppet/resource_provisioner.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/builtin/provisioners/puppet/resource_provisioner.go b/builtin/provisioners/puppet/resource_provisioner.go
index 6df0f005fc93..767b352afe2d 100644
--- a/builtin/provisioners/puppet/resource_provisioner.go
+++ b/builtin/provisioners/puppet/resource_provisioner.go
@@ -259,6 +259,7 @@ func (p *provisioner) generateAutosignToken(certname string) (string, error) {
 }
 
 func (p *provisioner) installPuppetAgentOpenSource() error {
+	task := "puppet_agent::install"
 
 	connType := p.instanceState.Ephemeral.ConnInfo["type"]
 	if connType == "" {
@@ -276,12 +277,12 @@ func (p *provisioner) installPuppetAgentOpenSource() error {
 		agentConnInfo,
 		p.BoltTimeout,
 		p.UseSudo,
-		"puppet_agent::install",
+		task,
 		nil,
 	)
 
 	if err != nil || result.Items[0].Status != "success" {
-		return fmt.Errorf("puppet_agent::install failed: %s\n%+v", err, result)
+		return fmt.Errorf("%s failed: %s\n%+v", task, err, result)
 	}
 
 	return nil