update deli-cli for instance user data

sandwichcloud · Jan 27, 2018 · 144b30c · 144b30c
1 parent 9f4992f
commit 144b30c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -5,4 +5,4 @@ import:
 - package: github.com/mitchellh/multistep
   version: 391576a156a54cfbb4cf5d5eda40cf6ffa3e3a4d
 - package: github.com/sandwichcloud/deli-cli
-  version: 0.0.16
+  version: 0.0.23
diff --git a/sandwich/step_run_instance.go b/sandwich/step_run_instance.go
@@ -36,15 +36,11 @@ func (s *StepRunInstance) Run(state multistep.StateBag) multistep.StepAction {
 		keyPairIDs = append(keyPairIDs, keyPairID.(string))
 	}
 
-	if s.UserData != "" {
-		s.Tags["user-data"] = s.UserData
-	}
-
 	if s.Tags == nil {
 		s.Tags = make(map[string]string)
 	}
 
-	instance, err := instanceClient.Create(s.Name, s.SourceImageID, config.RegionID, "", s.NetworkID, "", s.FlavorID, s.Disk, keyPairIDs, s.Tags)
+	instance, err := instanceClient.Create(s.Name, s.SourceImageID, config.RegionID, "", s.NetworkID, "", s.FlavorID, s.Disk, keyPairIDs, s.Tags, s.UserData)
 	if err != nil {
 		err := fmt.Errorf("Error creating source instance: %s", err)
 		state.Put("error", err)