From 6b12297127b57d73842b8d154e56c5d3316df450 Mon Sep 17 00:00:00 2001 From: Amartya Sinha Date: Wed, 24 Dec 2025 14:28:15 +0530 Subject: [PATCH] [multiple] Use FQCN for calling a module Any module in a task should be called through fully-qualified collection names (FQCN) to reduce ambiguity.a Ref: https://docs.ansible.com/projects/lint/rules/fqcn/ Signed-off-by: Amartya Sinha --- hooks/playbooks/ceph.yml | 2 +- plugins/README.md | 2 +- plugins/modules/approve_csr.py | 2 +- plugins/modules/bridge_vlan.py | 2 +- plugins/modules/cephx_key.py | 2 +- plugins/modules/crawl_n_mask.py | 6 +++--- plugins/modules/generate_make_tasks.py | 2 +- plugins/modules/get_makefiles_env.py | 2 +- plugins/modules/krb_request.py | 2 +- plugins/modules/pem_read.py | 4 ++-- plugins/modules/tempest_list_allowed.py | 2 +- plugins/modules/tempest_list_skipped.py | 2 +- roles/ci_nmstate/library/ci_nmstate_apply_state.py | 2 +- roles/install_yamls/tasks/main.yml | 2 +- roles/krb_request/tasks/main.yml | 2 +- roles/openshift_adm/tasks/wait_for_cluster.yml | 2 +- roles/tempest/tasks/tempest-tests.yml | 4 ++-- roles/test_operator/tasks/tempest-tests.yml | 4 ++-- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/hooks/playbooks/ceph.yml b/hooks/playbooks/ceph.yml index be0db4ed18..6e14f48d8f 100644 --- a/hooks/playbooks/ceph.yml +++ b/hooks/playbooks/ceph.yml @@ -330,7 +330,7 @@ cidr: 64 - name: Generate a cephx key - cephx_key: + cifmw.general.cephx_key: register: cephx no_log: true diff --git a/plugins/README.md b/plugins/README.md index 12161f14c4..dde6d2347f 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -213,7 +213,7 @@ Module that approves pending certificate requests in OpenShift platform. tasks: - name: Wait and approve all - approve_csr: + cifmw.general.approve_csr: k8s_config: "{{ k8s_config }}" ``` diff --git a/plugins/modules/approve_csr.py b/plugins/modules/approve_csr.py index a6d7714dea..16f9d3e365 100644 --- a/plugins/modules/approve_csr.py +++ b/plugins/modules/approve_csr.py @@ -39,7 +39,7 @@ EXAMPLES = r""" - name: Approve all pending certificate requests - approve_csr: + cifmw.general.approve_csr: k8s_config: "{{ lookup('env', 'KUBECONFIG') }}" """ diff --git a/plugins/modules/bridge_vlan.py b/plugins/modules/bridge_vlan.py index a3d03efdf4..0a5753d6c8 100644 --- a/plugins/modules/bridge_vlan.py +++ b/plugins/modules/bridge_vlan.py @@ -54,7 +54,7 @@ EXAMPLES = r""" - name: Attach all configured VLANs to the interfaces of osp_trunk become: true - bridge_vlan: + cifmw.general.bridge_vlan: networks: - osp_trunk """ # noqa diff --git a/plugins/modules/cephx_key.py b/plugins/modules/cephx_key.py index 3295902b23..d84cff29e1 100644 --- a/plugins/modules/cephx_key.py +++ b/plugins/modules/cephx_key.py @@ -22,7 +22,7 @@ EXAMPLES = r""" - name: Generate a cephx key - cephx_key: + cifmw.general.cephx_key: register: cephx - name: Show cephx key diff --git a/plugins/modules/crawl_n_mask.py b/plugins/modules/crawl_n_mask.py index 4d9cd66b47..1ea75c71d4 100755 --- a/plugins/modules/crawl_n_mask.py +++ b/plugins/modules/crawl_n_mask.py @@ -43,16 +43,16 @@ EXAMPLES = r""" - name: Mask secrets in all yaml/json/log files within /home/zuul/logs - crawl_n_mask: + cifmw.general.crawl_n_mask: path: /home/zuul/logs isdir: True - name: Mask my_secrets.yaml - crawl_n_mask: + cifmw.general.crawl_n_mask: path: /home/zuul/logs/my_secrets.yaml - name: Mask application.log - crawl_n_mask: + cifmw.general.crawl_n_mask: path: /var/log/application.log """ diff --git a/plugins/modules/generate_make_tasks.py b/plugins/modules/generate_make_tasks.py index ff72a9026d..3d538ecb31 100644 --- a/plugins/modules/generate_make_tasks.py +++ b/plugins/modules/generate_make_tasks.py @@ -41,7 +41,7 @@ mode: "0644" - name: Generate make tasks - generate_make_tasks: + cifmw.general.generate_make_tasks: install_yamls_path: "{{ cifmw_installyamls_repos }}" output_directory: "{{ ansible_user_dir }}/make_installyamls/tasks" """ # noqa diff --git a/plugins/modules/get_makefiles_env.py b/plugins/modules/get_makefiles_env.py index 4716f40c4e..880a0dda08 100644 --- a/plugins/modules/get_makefiles_env.py +++ b/plugins/modules/get_makefiles_env.py @@ -33,7 +33,7 @@ # Recursively get all the variables of the Makefiles under /home/user - name: Generate env var fact register: get_makefiles_env_out - get_makefiles_env: + cifmw.general.get_makefiles_env: base_path: /home/user """ diff --git a/plugins/modules/krb_request.py b/plugins/modules/krb_request.py index 0cb8ce188e..2ece429a86 100644 --- a/plugins/modules/krb_request.py +++ b/plugins/modules/krb_request.py @@ -54,7 +54,7 @@ EXAMPLES = r""" - name: Get some content - krb_request: + cifmw.general.krb_request: url: "http://someurl.local/resource" dest: "{{ ansible_user_dir }}/content.raw" mode: "0644" diff --git a/plugins/modules/pem_read.py b/plugins/modules/pem_read.py index 5f89856894..fbbb075450 100644 --- a/plugins/modules/pem_read.py +++ b/plugins/modules/pem_read.py @@ -41,12 +41,12 @@ EXAMPLES = r""" - name: Get pem certs from crt file - pem_read: + cifmw.general.pem_read: path: "/etc/ssl/certs/ca-certificates.crt" register: _certs - name: Get pem certs from crt file by OU - pem_read: + cifmw.general.pem_read: path: "/etc/ssl/certs/ca-certificates.crt" ou_filter: "Red Hat" register: _certs2 diff --git a/plugins/modules/tempest_list_allowed.py b/plugins/modules/tempest_list_allowed.py index c8c704f049..32a67ea0e2 100644 --- a/plugins/modules/tempest_list_allowed.py +++ b/plugins/modules/tempest_list_allowed.py @@ -47,7 +47,7 @@ EXAMPLES = r""" - name: Get list of allowed tests - tempest_list_allowed: + cifmw.general.tempest_list_allowed: yaml_file: /tmp/allowed.yaml job: tripleo-ci-centos-8-standalone groups: diff --git a/plugins/modules/tempest_list_skipped.py b/plugins/modules/tempest_list_skipped.py index 5fbaf104d0..cb7c3b9787 100644 --- a/plugins/modules/tempest_list_skipped.py +++ b/plugins/modules/tempest_list_skipped.py @@ -45,7 +45,7 @@ EXAMPLES = r""" - name: Get list of skipped tests - tempest_list_skipped: + cifmw.general.tempest_list_skipped: yaml_file: /tmp/skipped.yaml job: edpm release: master diff --git a/roles/ci_nmstate/library/ci_nmstate_apply_state.py b/roles/ci_nmstate/library/ci_nmstate_apply_state.py index a8aefc9b0a..44df2e538c 100755 --- a/roles/ci_nmstate/library/ci_nmstate_apply_state.py +++ b/roles/ci_nmstate/library/ci_nmstate_apply_state.py @@ -30,7 +30,7 @@ # Apply some network config to eth0 using nmstate - name: Generate env var fact register: get_makefiles_env_out - get_makefiles_env: + cifmw.general.get_makefiles_env: state: dns-resolver: running: diff --git a/roles/install_yamls/tasks/main.yml b/roles/install_yamls/tasks/main.yml index de8ac8dde5..5a18eccb87 100644 --- a/roles/install_yamls/tasks/main.yml +++ b/roles/install_yamls/tasks/main.yml @@ -152,7 +152,7 @@ tags: - bootstrap register: cifmw_generate_makes - generate_make_tasks: + cifmw.general.generate_make_tasks: install_yamls_path: "{{ cifmw_install_yamls_repo }}" output_directory: "{{ cifmw_install_yamls_tasks_out }}" diff --git a/roles/krb_request/tasks/main.yml b/roles/krb_request/tasks/main.yml index df66c1ba78..db2727f6bf 100644 --- a/roles/krb_request/tasks/main.yml +++ b/roles/krb_request/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. - name: Perform the request - krb_request: + cifmw.general.krb_request: url: "{{ cifmw_krb_request_url }}" dest: "{{ cifmw_krb_request_dest | default(omit) }}" mode: "{{ cifmw_krb_request_dest_mode | default(omit) }}" diff --git a/roles/openshift_adm/tasks/wait_for_cluster.yml b/roles/openshift_adm/tasks/wait_for_cluster.yml index f96a14518e..8fd5838dde 100644 --- a/roles/openshift_adm/tasks/wait_for_cluster.yml +++ b/roles/openshift_adm/tasks/wait_for_cluster.yml @@ -60,7 +60,7 @@ - name: Approve pending certificate requests register: _approve_csr - approve_csr: + cifmw.general.approve_csr: k8s_config: "{{ cifmw_openshift_kubeconfig }}" retries: 10 delay: 30 diff --git a/roles/tempest/tasks/tempest-tests.yml b/roles/tempest/tasks/tempest-tests.yml index b13f3c9f46..bb48d20699 100644 --- a/roles/tempest/tasks/tempest-tests.yml +++ b/roles/tempest/tasks/tempest-tests.yml @@ -26,7 +26,7 @@ src: "list_allowed.yml" - name: Get list of tests to be executed - tempest_list_allowed: + cifmw.general.tempest_list_allowed: yaml_file: "{{ cifmw_tempest_artifacts_basedir }}/list_allowed.yml" groups: "{{ cifmw_tempest_default_groups }}" job: "{{ cifmw_tempest_job_name | default(omit) }}" @@ -55,7 +55,7 @@ src: "list_skipped.yml" - name: Get list of tests to be excluded - tempest_list_skipped: + cifmw.general.tempest_list_skipped: yaml_file: "{{ cifmw_tempest_artifacts_basedir }}/list_skipped.yml" jobs: "{{ cifmw_tempest_default_jobs }}" register: diff --git a/roles/test_operator/tasks/tempest-tests.yml b/roles/test_operator/tasks/tempest-tests.yml index 31f5aa49a5..73f90a9267 100644 --- a/roles/test_operator/tasks/tempest-tests.yml +++ b/roles/test_operator/tasks/tempest-tests.yml @@ -26,7 +26,7 @@ src: "list_allowed.yml" - name: Get list of tests to be executed - tempest_list_allowed: + cifmw.general.tempest_list_allowed: yaml_file: "{{ cifmw_test_operator_artifacts_basedir }}/list_allowed.yml" groups: "{{ cifmw_test_operator_default_groups }}" job: "{{ cifmw_test_operator_instance_name | default(omit) }}" @@ -60,7 +60,7 @@ mode: "0644" - name: Get list of tests to be excluded - tempest_list_skipped: + cifmw.general.tempest_list_skipped: yaml_file: "{{ cifmw_test_operator_artifacts_basedir }}/list_skipped.yml" jobs: "{{ cifmw_test_operator_default_jobs }}" register: