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

make validateInventoryDirectoryConfig function

This commit is contained in:
Dan Fuchs 2017-04-06 14:50:02 -05:00
parent 39a9eac44f
commit f45f4568db
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
provisioner/ansible/provisioner.go
View File

@ -125,7 +125,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
} }
if len(p.config.InventoryDirectory) > 0 { if len(p.config.InventoryDirectory) > 0 {
err = validateDirectoryConfig(p.config.InventoryDirectory, "inventory_directory") err = validateInventoryDirectoryConfig(p.config.InventoryDirectory)
if err != nil { if err != nil {
log.Println(p.config.InventoryDirectory, "does not exist") log.Println(p.config.InventoryDirectory, "does not exist")
errs = packer.MultiErrorAppend(errs, err) errs = packer.MultiErrorAppend(errs, err)
@ -391,12 +391,12 @@ func validateFileConfig(name string, config string, req bool) error {
return nil return nil
} }
func validateDirectoryConfig(name string, config string) error { func validateInventoryDirectoryConfig(name string) error {
info, err := os.Stat(name) info, err := os.Stat(name)
if err != nil { if err != nil {
return fmt.Errorf("%s: %s is invalid: %s", config, name, err) return fmt.Errorf("inventory_directory: %s is invalid: %s", name, err)
} else if !info.IsDir() { } else if !info.IsDir() {
return fmt.Errorf("%s: %s must point to a directory", config, name) return fmt.Errorf("inventory_directory: %s must point to a directory", name)
} }
return nil return nil
} }