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

Merge pull request #1375 from yveslaroche/fix-ansible-inventory-path 

provisioner/ansible: Fix Ansible inventory path on Windows
This commit is contained in:
Mitchell Hashimoto 2014-09-02 09:51:31 -07:00
parent 5d1c1e6716 3bfeb54853
commit fa4b737620
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,7 +191,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
if len(p.config.InventoryFile) > 0 { if len(p.config.InventoryFile) > 0 {
ui.Message("Uploading inventory file...") ui.Message("Uploading inventory file...")
src := p.config.InventoryFile src := p.config.InventoryFile
dst := filepath.Join(p.config.StagingDir, filepath.Base(src)) dst := filepath.ToSlash(filepath.Join(p.config.StagingDir, filepath.Base(src)))
if err := p.uploadFile(ui, comm, dst, src); err != nil { if err := p.uploadFile(ui, comm, dst, src); err != nil {
return fmt.Errorf("Error uploading inventory file: %s", err) return fmt.Errorf("Error uploading inventory file: %s", err)
} }
@ -259,7 +259,7 @@ func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator) err
// with a single host. // with a single host.
inventory := "\"127.0.0.1,\"" inventory := "\"127.0.0.1,\""
if len(p.config.InventoryFile) > 0 { if len(p.config.InventoryFile) > 0 {
inventory = filepath.Join(p.config.StagingDir, filepath.Base(p.config.InventoryFile)) inventory = filepath.ToSlash(filepath.Join(p.config.StagingDir, filepath.Base(p.config.InventoryFile)))
} }
extraArgs := "" extraArgs := ""