iSharkFly-Docs/packer-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix hook data loading

Browse Source
This commit is contained in:
Megan Marsh 2019-12-16 11:22:21 -08:00
parent 1679d9fb9d
commit 21a849354b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/step_provision.go
View File

@ -23,8 +23,13 @@ import (
// <nothing> // <nothing>
func PopulateProvisionHookData(state multistep.StateBag) map[string]interface{} { func PopulateProvisionHookData(state multistep.StateBag) map[string]interface{} {
hookData := make(map[string]interface{})
// Load Builder hook data from state, if it has been set. // Load Builder hook data from state, if it has been set.
// hookData := state.GetOk("generated_data").(map[string]interface{}) hd, ok := state.GetOk("generated_data")
if ok {
hookData = hd.(map[string]interface{})
}
// instance_id is placed in state by the builders. // instance_id is placed in state by the builders.
// Not yet implemented in Chroot, lxc/lxd, Azure, Qemu. // Not yet implemented in Chroot, lxc/lxd, Azure, Qemu.
@ -41,7 +46,7 @@ func PopulateProvisionHookData(state multistep.StateBag) map[string]interface{}
// Warn user that the id isn't implemented // Warn user that the id isn't implemented
hookData["ID"] = "ERR_ID_NOT_IMPLEMENTED_BY_BUILDER" hookData["ID"] = "ERR_ID_NOT_IMPLEMENTED_BY_BUILDER"
} }
hookData["PACKER_RUN_UUID"] = os.Getenv("PACKER_RUN_UUID") hookData["PackerRunUUID"] = os.Getenv("PACKER_RUN_UUID")
// Read communicator data into hook data // Read communicator data into hook data
comm, ok := state.GetOk("communicator_config") comm, ok := state.GetOk("communicator_config")