From 9feb4c04b2af4dd3a516603860826751d0caa57d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Blaise?= Date: Tue, 20 Jul 2021 08:53:24 +0200 Subject: [PATCH] Remove fatal --- cmd/exec.go | 2 +- cmd/play.go | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cmd/exec.go b/cmd/exec.go index 1b07e16..ac2ed36 100644 --- a/cmd/exec.go +++ b/cmd/exec.go @@ -150,7 +150,7 @@ func exec(cmd *cobra.Command, args []string, path string) { options.AnsibleForceColor() err := adhoc.Run(context.TODO()) if err != nil { - log.Fatal(err) + log.Error(err) } } diff --git a/cmd/play.go b/cmd/play.go index c563ca1..3311606 100644 --- a/cmd/play.go +++ b/cmd/play.go @@ -17,8 +17,10 @@ package cmd import ( "context" + "github.com/apenella/go-ansible/pkg/execute" "github.com/apenella/go-ansible/pkg/options" "github.com/apenella/go-ansible/pkg/playbook" + "github.com/apenella/go-ansible/pkg/stdoutcallback/results" "github.com/ca-gip/dploy/internal/ansible" "github.com/ca-gip/dploy/internal/utils" log "github.com/sirupsen/logrus" @@ -98,6 +100,8 @@ func play(cmd *cobra.Command, args []string, path string) { limit, _ := cmd.Flags().GetStringSlice("limit") vaultPassFile, _ := cmd.Flags().GetString("vault-password-file") + summary := make(map[string]bool, len(inventories)) + // Execute ansible for each inventory (sequential) for _, inventory := range inventories { ansiblePlaybookOptions := &playbook.AnsiblePlaybookOptions{ @@ -110,12 +114,21 @@ func play(cmd *cobra.Command, args []string, path string) { play := playbook.AnsiblePlaybookCmd{ Playbooks: []string{play.RelativePath()}, Options: ansiblePlaybookOptions, + Exec: execute.NewDefaultExecute( + execute.WithTransformers( + results.Prepend(inventory.RelativePath()), + )), } options.AnsibleForceColor() err := play.Run(context.TODO()) if err != nil { - log.Fatal(err) + log.Error(err) + summary[inventory.RelativePath()] = false + } else { + summary[inventory.RelativePath()] = true } } + + log.Info(summary) }