Merge pull request #7065 from hashicorp/fix_6405

reverts 406bf9c4aad7c925c3f5a837fe7f9c71169af098; this was incorrect …
2018-12-04 11:43:51 +01:00 · 2018-12-04 11:43:51 +01:00 · 9bd802b6ec
parent 6f24bc48ac fa6eb3fdea
commit 9bd802b6ec
1 changed files with 1 additions and 3 deletions
--- 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",