From fa6eb3fdea1db15ccb80432fc0cdfdf8a2ddf5ee Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 3 Dec 2018 16:08:47 -0800 Subject: [PATCH] reverts 406bf9c4aad7c925c3f5a837fe7f9c71169af098; this was incorrect interpretation of the intent of the inventoryDirectory template option --- provisioner/ansible/provisioner.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index 84d3d71b5..ee92b1161 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -351,9 +351,7 @@ func (p *Provisioner) Cancel() { func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator, privKeyFile string) error { playbook, _ := filepath.Abs(p.config.PlaybookFile) inventory := p.config.InventoryFile - if len(p.config.InventoryDirectory) > 0 { - inventory = p.config.InventoryDirectory - } + var envvars []string args := []string{"--extra-vars", fmt.Sprintf("packer_build_name=%s packer_builder_type=%s",