From patchwork Wed Feb 5 19:47:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Gomez X-Patchwork-Id: 13961834 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BCE8DF5C for ; Wed, 5 Feb 2025 19:47:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738784853; cv=none; b=A5oBkrbrrpzcoK4wdf32WPp9qtmzxw4ceWqZmGMDvmYB6S+/zIq+IWrCD7AYMLk82XT93ge1UwgPFD3MrpjwprkooDhZ6rrW8SLw/eg3U+cWGgOytBYrQiC1B88Aad68y5/yHxNbNUuU++Ci7yuMUTMArFbGjYelFs6m17L5OVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738784853; c=relaxed/simple; bh=reWdjxvD64j9T9S2puh4SpIIxO5lTOczzRlYKvk/5GA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dYJ0pq6TQUbyBANEtU2j+3u4Z84JUahGLOLvjZeCEepXITQBocGKvuE9zZZNJIGAKv2lJczA0aYU2v55obilQ+KBGEJK3s6dgXdqZqSZOrcsM7ngA81ULdXHBi+Qfy3aXJQ5QOLOdkFAjxbM91fRu7gCH2eV6syd1odeW7z6usU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=V0ZusHQw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="V0ZusHQw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E277AC4CEE4; Wed, 5 Feb 2025 19:47:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738784852; bh=reWdjxvD64j9T9S2puh4SpIIxO5lTOczzRlYKvk/5GA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=V0ZusHQwbsGKHpNyrgZc9lS+S/TmZTKfdL2lWo7UNuED+U54RYsANKwqcvkKJ/Ofu di2KQ54fJe/xoVBvBzq7T4G50cpaOG1sf6MYQkmXVzzrSz1pZXcK4g7+VFzK4ifgn4 IsTs6eTQHc2txIF/79E6TdfhU2qgE0U9xfLqs3JDG7dJQlTjdvcPq9K8eP0JSH2SKy SkLDb6oNx1LiVU39Ludg/DSKHRw6L3LBQgfVyk/sJXxEzG608PuoAZoqvrFeuKaoqp HBI08PjJRz4n4M0//rI7cHLiw1NlojzdW74lZYnrVGi9I7Hep5gLgHVCJZ0z/c8MW4 4dJC+xd0Etdqw== From: da.gomez@kernel.org Date: Wed, 05 Feb 2025 19:47:16 +0000 Subject: [PATCH v2 1/2] ansible.cfg: autogenerate using kconfig Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250205-ansible_cfg3-v2-1-02620fc1e3d1@samsung.com> References: <20250205-ansible_cfg3-v2-0-02620fc1e3d1@samsung.com> In-Reply-To: <20250205-ansible_cfg3-v2-0-02620fc1e3d1@samsung.com> To: Luis Chamberlain , Chuck Lever Cc: kdevops@lists.linux.dev, Daniel Gomez X-Mailer: b4 0.14.2 From: Daniel Gomez Add a new ansible.cfg Makefile target, Ansible Playbook and Role to be able to configure the Ansible Configuration file (ansible.cfg) using Kconfig. This generate the ansible.cfg based on the same current settings. Add the new Ansible files (playbooks, cfg, Kconfig...) to the Ansible Wrapper maintainer entry. Move retries to [connection] ini section as per documentation [1]. [1] https://docs.ansible.com/ansible/latest/collections/ansible/builtin/ ssh_connection.html#parameter-reconnection_retries From commit 1961b177a9464423a24cd110f94682def7927331 ("ansible.cfg: bump retries to 2000"), this setting was required for OpenSUSE Tumbleweed. So, apply it only for this distro. Signed-off-by: Daniel Gomez --- .gitignore | 2 + MAINTAINERS | 4 + Makefile | 17 +++- ansible.cfg | 5 - kconfigs/Kconfig.ansible_cfg | 105 +++++++++++++++++++++ kconfigs/Kconfig.kdevops | 4 + playbooks/ansible_cfg.yml | 4 + playbooks/roles/ansible_cfg/defaults/main.yml | 10 ++ playbooks/roles/ansible_cfg/tasks/main.yml | 17 ++++ .../roles/ansible_cfg/templates/ansible.cfg.j2 | 14 +++ 10 files changed, 173 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c34739832c6501104c9c8bce9c31e87dfd9bcfb0..0ec5d2de89a943c903c3975bf607b72a6604fbb0 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,8 @@ extra_vars.json .config .config.old +ansible.cfg + scripts/kconfig/.mconf-cfg scripts/workflows/fstests/lib/__pycache__/ scripts/workflows/blktests/lib/__pycache__/ diff --git a/MAINTAINERS b/MAINTAINERS index 045d8c96208ef8f3f1c5d74d023a5117529511cf..6df6709fb59d14ba486050d2ce961923b292ec73 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -72,6 +72,10 @@ M: Daniel Gomez L: kdevops@lists.linux.dev S: Maintained T: git https://github.com/linux-kdevops/kdevops.git +F: ansible.cfg +F: kconfigs/Kconfig.ansible_cfg +F: playbooks/ansible_cfg.yml +F: playbooks/roles/ansible_cfg F: scripts/ansible_av.py F: scripts/ansible.Makefile diff --git a/Makefile b/Makefile index 14e647dcd45190ff51dd42627f58826998f07781..fa8761bcb6bc2c612ef7bff4f904c94ca258d523 100644 --- a/Makefile +++ b/Makefile @@ -190,9 +190,17 @@ include scripts/gen-nodes.Makefile make -f scripts/build.Makefile help ;\ false) + +PHONY += ansible.cfg +ansible.cfg: + @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ + --inventory localhost, \ + $(KDEVOPS_PLAYBOOKS_DIR)/ansible_cfg.yml \ + --extra-vars=@./.extra_vars_auto.yaml + PHONY += $(EXTRA_VAR_INPUTS) $(EXTRA_VAR_INPUTS_LAST) -$(KDEVOPS_EXTRA_VARS): .config $(EXTRA_VAR_INPUTS) $(EXTRA_VAR_INPUTS_LAST) +$(KDEVOPS_EXTRA_VARS): .config ansible.cfg $(EXTRA_VAR_INPUTS) $(EXTRA_VAR_INPUTS_LAST) playbooks/secret.yml: @if [[ "$(CONFIG_KDEVOPS_REG_TWOLINE_REGCODE)" == "" ]]; then \ @@ -204,7 +212,7 @@ playbooks/secret.yml: @echo "$(CONFIG_KDEVOPS_REG_TWOLINE_REGCODE_VAR): $(CONFIG_KDEVOPS_REG_TWOLINE_REGCODE)" >> $@ ifeq (y,$(CONFIG_KDEVOPS_ENABLE_DISTRO_EXTRA_ADDONS)) -$(KDEVOPS_EXTRA_ADDON_DEST): .config $(KDEVOPS_EXTRA_ADDON_SOURCE) +$(KDEVOPS_EXTRA_ADDON_DEST): .config ansible.cfg $(KDEVOPS_EXTRA_ADDON_SOURCE) $(Q)cp $(KDEVOPS_EXTRA_ADDON_SOURCE) $(KDEVOPS_EXTRA_ADDON_DEST) endif @@ -215,7 +223,7 @@ include scripts/bringup.Makefile endif DEFAULT_DEPS += $(KDEVOPS_HOSTS) -$(KDEVOPS_HOSTS): .config $(KDEVOPS_HOSTS_TEMPLATE) +$(KDEVOPS_HOSTS): .config ansible.cfg $(KDEVOPS_HOSTS_TEMPLATE) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/gen_hosts.yml \ @@ -223,7 +231,7 @@ $(KDEVOPS_HOSTS): .config $(KDEVOPS_HOSTS_TEMPLATE) --extra-vars=@./extra_vars.yaml DEFAULT_DEPS += $(KDEVOPS_NODES) -$(KDEVOPS_NODES) $(KDEVOPS_VAGRANT): .config $(KDEVOPS_NODES_TEMPLATE) +$(KDEVOPS_NODES) $(KDEVOPS_VAGRANT): .config ansible.cfg $(KDEVOPS_NODES_TEMPLATE) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/gen_nodes.yml \ @@ -253,6 +261,7 @@ mrproper: $(Q)rm -f $(KDEVOPS_NODES) $(Q)rm -f $(KDEVOPS_HOSTFILE) $(KDEVOPS_MRPROPER) $(Q)rm -f .config .config.old extra_vars.yaml $(KCONFIG_YAMLCFG) + $(Q)rm -f ansible.cfg $(Q)rm -f playbooks/secret.yml $(KDEVOPS_EXTRA_ADDON_DEST) $(Q)rm -rf include $(Q)rm -rf guestfs diff --git a/ansible.cfg b/ansible.cfg deleted file mode 100644 index 08350e0cf0f33e650801f4d8a2b450c77ef22a97..0000000000000000000000000000000000000000 --- a/ansible.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[defaults] -display_skipped_hosts = no -retries = 2000 -deprecation_warnings=False -stdout_callback=debug diff --git a/kconfigs/Kconfig.ansible_cfg b/kconfigs/Kconfig.ansible_cfg new file mode 100644 index 0000000000000000000000000000000000000000..2556ecad9ce29be1895caf7652938eb9229b0cb4 --- /dev/null +++ b/kconfigs/Kconfig.ansible_cfg @@ -0,0 +1,105 @@ +menu "Ansible Callback Plugin Configuration" +choice + prompt "Ansible Callback Plugin" + default KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DEBUG + +config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DEBUG + bool "Ansible Debug Callback Plugin" + output yaml + help + Debug: https://docs.ansible.com/ansible/latest/collections/ansible/builtin/debug_module.html + +config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DENSE + bool "Ansible Dense Callback Plugin" + output yaml + help + Dense: https://docs.ansible.com/ansible/latest/collections/community/general/dense_callback.html + +endchoice + +config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_STRING + string + output yaml + default "debug" if KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DEBUG + default "dense" if KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DENSE + +config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_CHECK_MODE_MARKERS + bool "check_mode_markers" + output yaml + default n + help + Toggle to control displaying markers when running in check mode. + https://docs.ansible.com/ansible/latest/collections/community/general/dense_callback.html#parameter-check_mode_markers + +config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DISPLAY_FAILED_STDERR + bool "display_failed_stderr" + output yaml + default n + help + Toggle to control whether failed and unreachable tasks are displayed to STDERR (vs. STDOUT). + https://docs.ansible.com/ansible/latest/collections/community/general/dense_callback.html#parameter-display_failed_stderr + +config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DISPLAY_OK_HOSTS + bool "display_ok_hosts" + output yaml + default y + help + Toggle to control displaying ‘ok’ task/host results in a task. + https://docs.ansible.com/ansible/latest/collections/community/general/dense_callback.html#parameter-display_ok_hosts + +config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DISPLAY_SKIPPED_HOSTS + bool "display_skipped_hosts" + output yaml + default n + help + Toggle to control displaying skipped task/host results in a task. + https://docs.ansible.com/ansible/latest/collections/community/general/dense_callback.html#parameter-display_skipped_hosts + +config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_SHOW_CUSTOM_STATS + bool "show_custom_stats" + output yaml + default n + help + This adds the custom stats set via the set_stats plugin to the play recap + https://docs.ansible.com/ansible/latest/collections/community/general/dense_callback.html#parameter-show_custom_stats + +config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_SHOW_PER_HOST_START + bool "show_per_host_start" + output yaml + default n + help + This adds output that shows when a task is started to execute for each host + https://docs.ansible.com/ansible/latest/collections/community/general/dense_callback.html#parameter-show_per_host_start + +config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_SHOW_TASK_PATH_ON_FAILURE + bool "show_task_path_on_failure" + output yaml + default n + help + When a task fails, display the path to the file containing the failed task and + the line number. This information is displayed automatically for every task when + running with -vv or greater verbosity. + https://docs.ansible.com/ansible/latest/collections/community/general/dense_callback.html#parameter-show_task_path_on_failure +endmenu + +config KDEVOPS_ANSIBLE_CFG_DEPRECATION_WARNINGS + bool "deprecation_warnings" + output yaml + default y + help + Toggle to control the showing of deprecation warnings + https://docs.ansible.com/ansible/latest/reference_appendices/config.html#deprecation-warnings + +if DISTRO_OPENSUSE + +config KDEVOPS_ANSIBLE_CFG_RECONNECTION_RETRIES + string "reconnection_retries" + output yaml + default 2000 + help + Number of attempts to connect. + Ansible retries connections only if it gets an SSH error with a return code of 255. + Any errors with return codes other than 255 indicate an issue with program execution. + https://docs.ansible.com/ansible/latest/collections/ansible/builtin/ssh_connection.html#parameter-reconnection_retries + +endif # DISTRO_OPENSUSE diff --git a/kconfigs/Kconfig.kdevops b/kconfigs/Kconfig.kdevops index c613ff20c193e717413d983af99bb97069988044..35e9758d789255721c522636ada49f84710e042f 100644 --- a/kconfigs/Kconfig.kdevops +++ b/kconfigs/Kconfig.kdevops @@ -195,3 +195,7 @@ endmenu menu "Kernel continous integration configuration" source "kconfigs/Kconfig.kernel-ci" endmenu + +menu "Ansible Configuration" +source "kconfigs/Kconfig.ansible_cfg" +endmenu diff --git a/playbooks/ansible_cfg.yml b/playbooks/ansible_cfg.yml new file mode 100644 index 0000000000000000000000000000000000000000..a81fd6e936bfc83967fab27f09f74e7b85337ed5 --- /dev/null +++ b/playbooks/ansible_cfg.yml @@ -0,0 +1,4 @@ +--- +- hosts: localhost + roles: + - role: ansible_cfg diff --git a/playbooks/roles/ansible_cfg/defaults/main.yml b/playbooks/roles/ansible_cfg/defaults/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..ab13b4a56cde7bc17378043e2f91e988f502cc3e --- /dev/null +++ b/playbooks/roles/ansible_cfg/defaults/main.yml @@ -0,0 +1,10 @@ +--- +kdevops_ansible_cfg_deprecation_warnings: True +kdevops_ansible_cfg_callback_plugin_string: debug +kdevops_ansible_cfg_callback_plugin_check_mode_markers: False +kdevops_ansible_cfg_callback_plugin_display_failed_stderr: False +kdevops_ansible_cfg_callback_plugin_display_ok_hosts: True +kdevops_ansible_cfg_callback_plugin_display_skipped_hosts: True +kdevops_ansible_cfg_callback_plugin_show_custom_stats: False +kdevops_ansible_cfg_callback_plugin_show_per_host_start: False +kdevops_ansible_cfg_callback_plugin_show_task_path_on_failure: False diff --git a/playbooks/roles/ansible_cfg/tasks/main.yml b/playbooks/roles/ansible_cfg/tasks/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..7e7fee78cb4dff1030122c875388b3291c1f3f60 --- /dev/null +++ b/playbooks/roles/ansible_cfg/tasks/main.yml @@ -0,0 +1,17 @@ +--- +- name: Import optional extra_args file + ansible.builtin.include_vars: + file: "{{ item }}" + with_first_found: + - files: + - "../extra_vars.yml" + - "../extra_vars.yaml" + - "../extra_vars.json" + skip: true + failed_when: false + tags: vars + +- name: Generate kdevops ansible.cfg + template: + src: "ansible.cfg.j2" + dest: "{{ topdir_path }}/ansible.cfg" diff --git a/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 b/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 new file mode 100644 index 0000000000000000000000000000000000000000..dadb294df17e4838721ae0971a2bf2103770556d --- /dev/null +++ b/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 @@ -0,0 +1,14 @@ +[defaults] +deprecation_warnings = {{ kdevops_ansible_cfg_deprecation_warnings }} +stdout_callback = {{ kdevops_ansible_cfg_callback_plugin_string }} +check_mode_markers = {{ kdevops_ansible_cfg_callback_plugin_check_mode_markers }} +display_failed_stderr = {{ kdevops_ansible_cfg_callback_plugin_display_failed_stderr }} +display_ok_hosts = {{ kdevops_ansible_cfg_callback_plugin_display_ok_hosts }} +display_skipped_hosts = {{ kdevops_ansible_cfg_callback_plugin_display_skipped_hosts }} +show_custom_stats = {{ kdevops_ansible_cfg_callback_plugin_show_custom_stats }} +show_per_host_start = {{ kdevops_ansible_cfg_callback_plugin_show_per_host_start }} +show_task_path_on_failure = {{ kdevops_ansible_cfg_callback_plugin_show_task_path_on_failure }} +{% if ansible_facts['distribution'] == 'openSUSE' %} +[connection] +retries = {{ kdevops_ansible_cfg_reconnection_retries }} +{% endif %} From patchwork Wed Feb 5 19:47:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez X-Patchwork-Id: 13961835 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A7BA1E0DE4 for ; Wed, 5 Feb 2025 19:47:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738784854; cv=none; b=f+DWk/kbIMDbI0y/YaT3GMuIJE9Qoab/56IiRo+rPlKfv1ILMSZt7Mcp/PPKyYyeamYtOWN9JuDxIrBEnIUua0TV4unuBsDpk4R6Vd166sFhF+NsXIkFdPPi9ZGVnYKyi//hzvYjqa0+cnhbLRuYr3aU6Az8sxn18NorTYayLlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738784854; c=relaxed/simple; bh=q7+1qBy0L+jPXzAH/ihzkoAklDVQaDc4rJi8P+gQqg8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dD4QiWkmWglaJzcf8Sz98MdKaGieQWDElb0yVgu1ZYbgSjs8SGIImSXO8lgl4Ml0TkT3u6XCjdMuodK25j8kQnq3mAi3TwDXZgDz9wk6sjMaeDk+qnoYmGhL5Mk3PuntZwv6OruhEnfYurlDxc9YC7kimMDyFKl76jY2UpZ5a2Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oqn2Us9a; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oqn2Us9a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 237D2C4CEDD; Wed, 5 Feb 2025 19:47:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738784853; bh=q7+1qBy0L+jPXzAH/ihzkoAklDVQaDc4rJi8P+gQqg8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oqn2Us9ay5E9AormNc4Q/Jx+MRtSzP1O4crW5pJ/F0dQyo34hh9ZZe6P2JAGr9tbP uY7TalPHZ9bsw9SwgECA3eDZk+pAnsLsxbHjNNYfAi7GeZnD0Kxi0LLrUtTtXB+wVh sNgrJWTiMeAe5kRLvk6QcitmrTAUhARYVG9bTHZBiVtgiLUmuAlUrROT2gJls89e3C lIInj0TjO7Gm5lx9r0If/LGWdiGuETIg9TRz70yvgxutnuFsvyDsJ3EwpilI+jv1Er 8sT0V24Zh+K+NEBjTrlmq+fPmhhoWkeBhL7N5IvAOb2P+/RjKm6KmMEOTwjHVw6C6M tsJEurWdsU6qg== From: da.gomez@kernel.org Date: Wed, 05 Feb 2025 19:47:17 +0000 Subject: [PATCH v2 2/2] ansible.cfg: change defaults to minimal Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250205-ansible_cfg3-v2-2-02620fc1e3d1@samsung.com> References: <20250205-ansible_cfg3-v2-0-02620fc1e3d1@samsung.com> In-Reply-To: <20250205-ansible_cfg3-v2-0-02620fc1e3d1@samsung.com> To: Luis Chamberlain , Chuck Lever Cc: kdevops@lists.linux.dev, Daniel Gomez X-Mailer: b4 0.14.2 From: Daniel Gomez Set default Callback plugin to Dense for a minimal stdout. Also, enable show_per_host_start to show when a task is started. And enable show_task_path_on_failure to show failed task when failure. Signed-off-by: Daniel Gomez --- kconfigs/Kconfig.ansible_cfg | 6 +++--- playbooks/roles/ansible_cfg/defaults/main.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kconfigs/Kconfig.ansible_cfg b/kconfigs/Kconfig.ansible_cfg index 2556ecad9ce29be1895caf7652938eb9229b0cb4..653c613138f2c2d2c116f0da5cd8baac15a56462 100644 --- a/kconfigs/Kconfig.ansible_cfg +++ b/kconfigs/Kconfig.ansible_cfg @@ -1,7 +1,7 @@ menu "Ansible Callback Plugin Configuration" choice prompt "Ansible Callback Plugin" - default KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DEBUG + default KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DENSE config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_DEBUG bool "Ansible Debug Callback Plugin" @@ -66,7 +66,7 @@ config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_SHOW_CUSTOM_STATS config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_SHOW_PER_HOST_START bool "show_per_host_start" output yaml - default n + default y help This adds output that shows when a task is started to execute for each host https://docs.ansible.com/ansible/latest/collections/community/general/dense_callback.html#parameter-show_per_host_start @@ -74,7 +74,7 @@ config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_SHOW_PER_HOST_START config KDEVOPS_ANSIBLE_CFG_CALLBACK_PLUGIN_SHOW_TASK_PATH_ON_FAILURE bool "show_task_path_on_failure" output yaml - default n + default y help When a task fails, display the path to the file containing the failed task and the line number. This information is displayed automatically for every task when diff --git a/playbooks/roles/ansible_cfg/defaults/main.yml b/playbooks/roles/ansible_cfg/defaults/main.yml index ab13b4a56cde7bc17378043e2f91e988f502cc3e..f0bdde30864631e2df02fe5e01707db261183bcc 100644 --- a/playbooks/roles/ansible_cfg/defaults/main.yml +++ b/playbooks/roles/ansible_cfg/defaults/main.yml @@ -1,10 +1,10 @@ --- kdevops_ansible_cfg_deprecation_warnings: True -kdevops_ansible_cfg_callback_plugin_string: debug +kdevops_ansible_cfg_callback_plugin_string: dense kdevops_ansible_cfg_callback_plugin_check_mode_markers: False kdevops_ansible_cfg_callback_plugin_display_failed_stderr: False kdevops_ansible_cfg_callback_plugin_display_ok_hosts: True kdevops_ansible_cfg_callback_plugin_display_skipped_hosts: True kdevops_ansible_cfg_callback_plugin_show_custom_stats: False -kdevops_ansible_cfg_callback_plugin_show_per_host_start: False -kdevops_ansible_cfg_callback_plugin_show_task_path_on_failure: False +kdevops_ansible_cfg_callback_plugin_show_per_host_start: True +kdevops_ansible_cfg_callback_plugin_show_task_path_on_failure: True