Re: [PATCH 6/8] ansible_cfg: add inventory support

[Chuck Lever <chuck.lever@oracle.com>]

On 5/1/25 2:35 PM, Daniel Gomez wrote:
> From: Daniel Gomez <da.gomez@samsung.com>
> 
> Allow to configure the inventory file (currently via KDEVOPS_HOSTFILE
> and KDEVOPS_HOSTS) via ansible.cfg.
> 
> The Ansible inventory file [1][2][3] is used in all kdevops/Makefile
> ansible-playbook calls. Enable this configuration to the global Ansible
> configuration file (ansible.cfg) and allow to define the inventory via
> Kconfig. This will simplify the playbook invocation.
> 
> [1]
> https://docs.ansible.com/ansible/latest/reference_appendices/
> config.html#default-host-list
> 
> [2]
> https://docs.ansible.com/ansible/latest/cli/
> ansible-inventory.html#cmdoption-ansible-inventory-i
> 
> [3]
> https://docs.ansible.com/ansible/latest/reference_appendices/
> config.html#envvar-ANSIBLE_INVENTORY
> 
> This has not effects yet as all ansible-playbook calls specify the
> --inventory/-i argument. The next commits will cleanup and allow the
> inventory defined in ansible.cfg to actually work.
> 
> Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
> ---
>  kconfigs/Kconfig.ansible_cfg                         | 5 +++++
>  kconfigs/Kconfig.ansible_provisioning                | 6 ------
>  playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 | 1 +
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/kconfigs/Kconfig.ansible_cfg b/kconfigs/Kconfig.ansible_cfg
> index b587596bc8d5f1215fa8c006f32d941bea5288cc..05587cf31098cc5ca816d5b5fbbcdc9e8794e641 100644
> --- a/kconfigs/Kconfig.ansible_cfg
> +++ b/kconfigs/Kconfig.ansible_cfg
> @@ -207,6 +207,11 @@ config ANSIBLE_CFG_FORKS
>  
>  endif # !ANSIBLE_CFG_FORKS_CUSTOM
>  
> +config ANSIBLE_CFG_INVENTORY
> +	string "Ansible Inventory"

Perhaps "Pathname to Ansible hosts inventory file" might be more clear.


> +	output yaml
> +	default "$(TOPDIR_PATH)/hosts"

I've never had need to adjust this pathname. It would be great to
include a help section here that explains why changing this pathname
might be necessary.


> +
>  if DISTRO_OPENSUSE
>  
>  config ANSIBLE_CFG_RECONNECTION_RETRIES
> diff --git a/kconfigs/Kconfig.ansible_provisioning b/kconfigs/Kconfig.ansible_provisioning
> index 63f04306e7b26f228defa9e50630f5ed07eaac37..4416d06754df3a9645fef15173e83e2279cfce1a 100644
> --- a/kconfigs/Kconfig.ansible_provisioning
> +++ b/kconfigs/Kconfig.ansible_provisioning
> @@ -98,12 +98,6 @@ config KDEVOPS_DEVCONFIG_SYSTEMD_WATCHDOG_TIMEOUT_KEXEC
>  
>  endif # KDEVOPS_DEVCONFIG_ENABLE_SYSTEMD_WATCHDOG
>  
> -config KDEVOPS_ANSIBLE_INVENTORY_FILE
> -	string "The ansible inventory file to use"
> -	default $(shell, scripts/append-makefile-vars.sh $(KDEVOPS_HOSTFILE))
> -	help
> -	  The file to use for the ansible inventory.
> -
>  config HAVE_DISTRO_PREFERS_ANSIBLE_PYTHON2
>  	bool
>  	default n
> diff --git a/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2 b/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2
> index 2bc916321f424ab93447af40eccef30911d27bb6..fddbab6d3a4dc03524a819b5b695336445ecb732 100644
> --- a/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2
> +++ b/playbooks/roles/ansible_cfg/templates/ansible.cfg.j2
> @@ -10,6 +10,7 @@ show_per_host_start = {{ ansible_cfg_callback_plugin_show_per_host_start }}
>  show_task_path_on_failure = {{ ansible_cfg_callback_plugin_show_task_path_on_failure }}
>  interpreter_python = {{ ansible_cfg_interpreter_python_string }}
>  forks = {{ ansible_cfg_forks }}
> +inventory = {{ ansible_cfg_inventory }}
>  {% if ansible_facts['distribution'] == 'openSUSE' %}
>  [connection]
>  retries = {{ ansible_cfg_reconnection_retries }}
> 


-- 
Chuck Lever