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

Merge pull request #1562 from bhcleek/ansible-local-inventory-best-practice 

provisioners/ansible-local: always use an inventory file
This commit is contained in:
Mitchell Hashimoto 2014-10-27 17:01:12 -07:00
parent ad3b9840c4 afa499befd
commit 8cdb686505
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
provisioner/ansible-local/provisioner.go
View File

@ -2,11 +2,13 @@ package ansiblelocal
import ( import (
"fmt" "fmt"
"github.com/mitchellh/packer/common" "io/ioutil"
"github.com/mitchellh/packer/packer"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer"
) )
const DefaultStagingDir = "/tmp/packer-provisioner-ansible-local" const DefaultStagingDir = "/tmp/packer-provisioner-ansible-local"
@ -188,13 +190,29 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
return fmt.Errorf("Error uploading main playbook: %s", err) return fmt.Errorf("Error uploading main playbook: %s", err)
} }
if len(p.config.InventoryFile) > 0 { if len(p.config.InventoryFile) == 0 {
ui.Message("Uploading inventory file...") tf, err := ioutil.TempFile("", "packer-provisioner-ansible-local")
src := p.config.InventoryFile if err != nil {
dst := filepath.ToSlash(filepath.Join(p.config.StagingDir, filepath.Base(src))) return fmt.Errorf("Error preparing inventory file: %s", err)
if err := p.uploadFile(ui, comm, dst, src); err != nil {
return fmt.Errorf("Error uploading inventory file: %s", err)
} }
defer os.Remove(tf.Name())
_, err = tf.Write([]byte("127.0.0.1"))
if err != nil {
tf.Close()
return fmt.Errorf("Error preparing inventory file: %s", err)
}
tf.Close()
p.config.InventoryFile = tf.Name()
defer func() {
p.config.InventoryFile = ""
}()
}
ui.Message("Uploading inventory file...")
src = p.config.InventoryFile
dst = filepath.ToSlash(filepath.Join(p.config.StagingDir, filepath.Base(src)))
if err := p.uploadFile(ui, comm, dst, src); err != nil {
return fmt.Errorf("Error uploading inventory file: %s", err)
} }
if len(p.config.GroupVars) > 0 { if len(p.config.GroupVars) > 0 {
@ -253,14 +271,7 @@ func (p *Provisioner) Cancel() {
func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator) error { func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator) error {
playbook := filepath.ToSlash(filepath.Join(p.config.StagingDir, filepath.Base(p.config.PlaybookFile))) playbook := filepath.ToSlash(filepath.Join(p.config.StagingDir, filepath.Base(p.config.PlaybookFile)))
inventory := filepath.ToSlash(filepath.Join(p.config.StagingDir, filepath.Base(p.config.InventoryFile)))
// The inventory must be set to "127.0.0.1,". The comma is important
// as its the only way to override the ansible inventory when dealing
// with a single host.
inventory := "\"127.0.0.1,\""
if len(p.config.InventoryFile) > 0 {
inventory = filepath.ToSlash(filepath.Join(p.config.StagingDir, filepath.Base(p.config.InventoryFile)))
}
extraArgs := "" extraArgs := ""
if len(p.config.ExtraArguments) > 0 { if len(p.config.ExtraArguments) > 0 {