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

GH 10008: fix ansible-galaxy for v1 files

This commit is contained in:
js-g 2020-09-28 18:07:38 -04:00
parent bdb1c47532
commit 08d485b1f9
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
provisioner/ansible/provisioner.go
View File

@ -648,15 +648,20 @@ func (p *Provisioner) executeGalaxy(ui packer.Ui, comm packer.Communicator) erro
collectionArgs = append(collectionArgs, "-p", filepath.ToSlash(p.config.CollectionsPath))
}
roleInstallError := p.invokeGalaxyCommand(roleArgs, ui, comm)
// Return the error if the role installation failed before attempting the collection install
if roleInstallError != nil {
// Run normal ansible-galaxy install for roles
if roleInstallError := p.invokeGalaxyCommand(roleArgs, ui, comm); roleInstallError != nil {
return roleInstallError
}
// If all is well, proceed with collection install
// This variable isn't strictly necessary but including for readability to match the role installation
collectionInstallError := p.invokeGalaxyCommand(collectionArgs, ui, comm)
return collectionInstallError
// Search galaxy_file for collections keyword. If present, run collections install
if f, err := ioutil.ReadFile(galaxyFile); err == nil {
if strings.Contains(string(f), "collections:") {
collectionInstallError := p.invokeGalaxyCommand(collectionArgs, ui, comm)
return collectionInstallError
}
}
return nil
}
// Intended to be invoked from p.executeGalaxy depending on the Ansible Galaxy parameters passed to Packer