From 429c79cacaf2dd5bb63d8c0e6670e7adac1707fd Mon Sep 17 00:00:00 2001
From: Brad Sickles <brad_sickles@mckinsey.com>
Date: Sun, 3 Sep 2017 09:09:46 -0400
Subject: [PATCH] Moving state setup for hyperv vhd builder to be consistent

---
 builder/hyperv/vhd/builder.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/builder/hyperv/vhd/builder.go b/builder/hyperv/vhd/builder.go
index 18ef4df4c4e..93ffd3d0b91 100644
--- a/builder/hyperv/vhd/builder.go
+++ b/builder/hyperv/vhd/builder.go
@@ -37,15 +37,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		return nil, fmt.Errorf("Failed creating Hyper-V driver: %s", err)
 	}
 
-	// Set up the state.
-	state := new(multistep.BasicStateBag)
-	state.Put("cache", cache)
-	state.Put("config", &b.config)
-	state.Put("debug", b.config.PackerDebug)
-	state.Put("driver", driver)
-	state.Put("hook", hook)
-	state.Put("ui", ui)
-
 	steps := []multistep.Step{
 		&hypervcommon.StepCreateTempDir{
 			TempPath: b.config.TempPath,
@@ -145,6 +136,15 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		// the clean up actions for each step will be executed reverse order
 	}
 
+	// Set up the state.
+	state := new(multistep.BasicStateBag)
+	state.Put("cache", cache)
+	state.Put("config", &b.config)
+	state.Put("debug", b.config.PackerDebug)
+	state.Put("driver", driver)
+	state.Put("hook", hook)
+	state.Put("ui", ui)
+
 	// Run
 	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(state)