From 6e434f4948f14a3ecf1e8ce86ec492e2af1635a2 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Wed, 31 Mar 2021 11:59:57 +0100
Subject: [PATCH] Actually set stdout_callback=ci by default
---
float | 1 +
test-driver | 5 +----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/float b/float
index 7c80cf12..77c84cb8 100755
--- a/float
+++ b/float
@@ -179,6 +179,7 @@ DEFAULT_VARS = {
'nocows': 1,
'display_skipped_hosts': False,
'callback_whitelist': 'ci',
+ 'stdout_callback': 'ci',
'host_key_checking': False,
'forks': 50,
},
diff --git a/test-driver b/test-driver
index 2dac37b6..879d7055 100755
--- a/test-driver
+++ b/test-driver
@@ -73,7 +73,7 @@ run_init() {
|| die "failed to run the init-credentials playbook"
log Running main playbook
- ${float_dir}/float run -vv site.yml \
+ ${float_dir}/float run site.yml \
|| die "failed to run the main playbook"
}
@@ -137,9 +137,6 @@ case "$cmd" in
;;
run)
- # The 'yaml' output format has slightly more legible errors.
- export ANSIBLE_STDOUT_CALLBACK=yaml
-
for playbook in "${float_dir}/test/integration-test-docker.yml" "$@"; do
log Running test playbook ${playbook}
${float_dir}/float run ${playbook} \
--
GitLab