Skip to content
Snippets Groups Projects
Commit 6e434f49 authored by ale's avatar ale
Browse files

Actually set stdout_callback=ci by default

parent 874d436b
No related branches found
No related tags found
No related merge requests found
...@@ -179,6 +179,7 @@ DEFAULT_VARS = { ...@@ -179,6 +179,7 @@ DEFAULT_VARS = {
'nocows': 1, 'nocows': 1,
'display_skipped_hosts': False, 'display_skipped_hosts': False,
'callback_whitelist': 'ci', 'callback_whitelist': 'ci',
'stdout_callback': 'ci',
'host_key_checking': False, 'host_key_checking': False,
'forks': 50, 'forks': 50,
}, },
......
...@@ -73,7 +73,7 @@ run_init() { ...@@ -73,7 +73,7 @@ run_init() {
|| die "failed to run the init-credentials playbook" || die "failed to run the init-credentials playbook"
log Running main 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" || die "failed to run the main playbook"
} }
...@@ -137,9 +137,6 @@ case "$cmd" in ...@@ -137,9 +137,6 @@ case "$cmd" in
;; ;;
run) 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 for playbook in "${float_dir}/test/integration-test-docker.yml" "$@"; do
log Running test playbook ${playbook} log Running test playbook ${playbook}
${float_dir}/float run ${playbook} \ ${float_dir}/float run ${playbook} \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment