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

fix (provisioner/ansible): add checks for both roles and collections

This commit is contained in:
js-g 2020-09-29 13:43:32 -04:00
parent 08d485b1f9
commit d7507ae67c
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
provisioner/ansible/provisioner.go
View File

@ -375,7 +375,7 @@ func (p *Provisioner) setupAdapter(ui packer.Ui, comm packer.Communicator) (stri
keyChecker := ssh.CertChecker{ keyChecker := ssh.CertChecker{
UserKeyFallback: func(conn ssh.ConnMetadata, pubKey ssh.PublicKey) (*ssh.Permissions, error) { UserKeyFallback: func(conn ssh.ConnMetadata, pubKey ssh.PublicKey) (*ssh.Permissions, error) {
if user := conn.User(); user != p.config.User { if user := conn.User(); user != p.config.User {
return nil, errors.New(fmt.Sprintf("authentication failed: %s is not a valid user", user)) return nil, fmt.Errorf("authentication failed: %s is not a valid user", user)
} }
if !bytes.Equal(k.Marshal(), pubKey.Marshal()) { if !bytes.Equal(k.Marshal(), pubKey.Marshal()) {
@ -648,15 +648,24 @@ func (p *Provisioner) executeGalaxy(ui packer.Ui, comm packer.Communicator) erro
collectionArgs = append(collectionArgs, "-p", filepath.ToSlash(p.config.CollectionsPath)) collectionArgs = append(collectionArgs, "-p", filepath.ToSlash(p.config.CollectionsPath))
} }
// Run normal ansible-galaxy install for roles // Search galaxy_file for roles and collections keywords
f, err := ioutil.ReadFile(galaxyFile)
if err != nil {
return err
}
hasRoles, _ := regexp.Match(`(?m)^roles:`, f)
hasCollections, _ := regexp.Match(`(?m)^collections:`, f)
// If if roles keyword present (v2 format), or no collections keywork present (v1), install roles
if hasRoles || !hasCollections {
if roleInstallError := p.invokeGalaxyCommand(roleArgs, ui, comm); roleInstallError != nil { if roleInstallError := p.invokeGalaxyCommand(roleArgs, ui, comm); roleInstallError != nil {
return roleInstallError return roleInstallError
} }
}
// Search galaxy_file for collections keyword. If present, run collections install // If collections keyword present (v2 format), install collections
if f, err := ioutil.ReadFile(galaxyFile); err == nil { if hasCollections {
if strings.Contains(string(f), "collections:") { if collectionInstallError := p.invokeGalaxyCommand(collectionArgs, ui, comm); collectionInstallError != nil {
collectionInstallError := p.invokeGalaxyCommand(collectionArgs, ui, comm)
return collectionInstallError return collectionInstallError
} }
} }