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

Merge pull request #6107 from thedrow/ansible-custom-inventory-file 

Allow Ansible to use a custom inventory file
This commit is contained in:
M. Marsh 2018-04-05 10:57:58 -07:00 committed by GitHub
parent cfbe026134 c0719a3590
commit 078434cded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
provisioner/ansible/provisioner.go
View File

@ -56,7 +56,7 @@ type Config struct {
SkipVersionCheck bool `mapstructure:"skip_version_check"` SkipVersionCheck bool `mapstructure:"skip_version_check"`
UseSFTP bool `mapstructure:"use_sftp"` UseSFTP bool `mapstructure:"use_sftp"`
InventoryDirectory string `mapstructure:"inventory_directory"` InventoryDirectory string `mapstructure:"inventory_directory"`
inventoryFile string InventoryFile string `mapstructure:"inventory_file"`
} }
type Provisioner struct { type Provisioner struct {
@ -266,7 +266,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
go p.adapter.Serve() go p.adapter.Serve()
if len(p.config.inventoryFile) == 0 { if len(p.config.InventoryFile) == 0 {
tf, err := ioutil.TempFile(p.config.InventoryDirectory, "packer-provisioner-ansible") tf, err := ioutil.TempFile(p.config.InventoryDirectory, "packer-provisioner-ansible")
if err != nil { if err != nil {
return fmt.Errorf("Error preparing inventory file: %s", err) return fmt.Errorf("Error preparing inventory file: %s", err)
@ -295,9 +295,9 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
return fmt.Errorf("Error preparing inventory file: %s", err) return fmt.Errorf("Error preparing inventory file: %s", err)
} }
tf.Close() tf.Close()
p.config.inventoryFile = tf.Name() p.config.InventoryFile = tf.Name()
defer func() { defer func() {
p.config.inventoryFile = "" p.config.InventoryFile = ""
}() }()
} }
@ -320,7 +320,7 @@ func (p *Provisioner) Cancel() {
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.config.inventoryFile inventory := p.config.InventoryFile
if len(p.config.InventoryDirectory) > 0 { if len(p.config.InventoryDirectory) > 0 {
inventory = p.config.InventoryDirectory inventory = p.config.InventoryDirectory
} }

7
website/source/docs/provisioners/ansible.html.md
View File

@ -81,8 +81,13 @@ Optional Parameters:
should be placed. When unspecified, the host is not associated with any should be placed. When unspecified, the host is not associated with any
groups. groups.
- `inventory_file` (string) - The inventory file to use during provisioning.
When unspecified, Packer will create a temporary inventory file and will
use the `host_alias`.
- `host_alias` (string) - The alias by which the Ansible host should be known. - `host_alias` (string) - The alias by which the Ansible host should be known.
Defaults to `default`. Defaults to `default`. This setting is ignored when using a custom inventory
file.
- `inventory_directory` (string) - The directory in which to place the - `inventory_directory` (string) - The directory in which to place the
temporary generated Ansible inventory file. By default, this is the temporary generated Ansible inventory file. By default, this is the