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

Ansible provisioner: Specify full path to generated inventory file

This commit is contained in:
Dan Fuchs 2017-04-04 22:04:26 -05:00
parent 609e70face
commit 492bff474b
2 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
provisioner/ansible/provisioner.go
View File

@ -301,16 +301,9 @@ func (p *Provisioner) Cancel() {
os.Exit(0) os.Exit(0)
} }
func (p *Provisioner) getInventoryArg() string {
if len(p.config.InventoryDirectory) != 0 {
return p.config.InventoryDirectory
}
return p.config.inventoryFile
}
func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator, privKeyFile string) error { func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator, privKeyFile string) error {
playbook, _ := filepath.Abs(p.config.PlaybookFile) playbook, _ := filepath.Abs(p.config.PlaybookFile)
inventory := p.getInventoryArg() inventory := p.config.inventoryFile
var envvars []string var envvars []string
args := []string{playbook, "-i", inventory} args := []string{playbook, "-i", inventory}

49
provisioner/ansible/provisioner_test.go
View File

@ -252,55 +252,6 @@ func TestProvisionerPrepare_LocalPort(t *testing.T) {
} }
} }
func TestProvisioner_getInventoryArg(t *testing.T) {
var p Provisioner
config := testConfig(t)
defer os.Remove(config["command"].(string))
hostkey_file, err := ioutil.TempFile("", "hostkey")
if err != nil {
t.Fatalf("err: %s", err)
}
defer os.Remove(hostkey_file.Name())
publickey_file, err := ioutil.TempFile("", "publickey")
if err != nil {
t.Fatalf("err: %s", err)
}
defer os.Remove(publickey_file.Name())
playbook_file, err := ioutil.TempFile("", "playbook")
if err != nil {
t.Fatalf("err: %s", err)
}
defer os.Remove(playbook_file.Name())
config["ssh_host_key_file"] = hostkey_file.Name()
config["ssh_authorized_key_file"] = publickey_file.Name()
config["playbook_file"] = playbook_file.Name()
err = p.Prepare(config)
if err != nil {
t.Fatalf("err: %s", err)
}
p.config.inventoryFile = "somefile"
if p.getInventoryArg() != "somefile" {
t.Fatal("getInventoryArg should return inventoryFile if InventoryDirectory is not set.")
}
// Uses InventoryDirectory if set
config["inventory_directory"] = "somedirectory"
err = p.Prepare(config)
if err != nil {
t.Fatalf("err: %s", err)
}
if p.getInventoryArg() != "somedirectory" {
t.Fatal("getInventoryArg should return InventoryDirectory if InventoryDirectory is set.")
}
}
func TestAnsibleGetVersion(t *testing.T) { func TestAnsibleGetVersion(t *testing.T) {
if os.Getenv("PACKER_ACC") == "" { if os.Getenv("PACKER_ACC") == "" {
t.Skip("This test is only run with PACKER_ACC=1 and it requires Ansible to be installed") t.Skip("This test is only run with PACKER_ACC=1 and it requires Ansible to be installed")