From c6c0c888840a00b30b36fd933b6950d1912c860a Mon Sep 17 00:00:00 2001 From: "tompage1994@hotmail.co.uk" Date: Wed, 8 Feb 2023 16:37:29 +0000 Subject: [PATCH] Fix linting --- .ansible-lint | 1 + .github/tests/pah_configure.yml | 2 +- roles/ansible_config/README.md | 2 +- roles/ansible_config/tests/test.yml | 2 +- roles/collection/README.md | 2 +- roles/collection/tests/test.yml | 2 +- roles/dispatch/README.md | 2 +- roles/dispatch/tests/test.yml | 2 +- roles/ee_image/README.md | 2 +- roles/ee_image/tests/test.yml | 2 +- roles/ee_namespace/README.md | 2 +- roles/ee_namespace/tests/test.yml | 2 +- roles/ee_registry/README.md | 2 +- roles/ee_registry/tests/test.yml | 2 +- roles/ee_registry_index/README.md | 2 +- roles/ee_registry_index/tests/test.yml | 2 +- roles/ee_registry_sync/README.md | 2 +- roles/ee_registry_sync/tests/test.yml | 2 +- roles/ee_repository/README.md | 2 +- roles/ee_repository/tests/test.yml | 2 +- roles/ee_repository_sync/README.md | 2 +- roles/ee_repository_sync/tests/test.yml | 2 +- roles/group/README.md | 2 +- roles/group/tests/test.yml | 2 +- roles/namespace/README.md | 2 +- roles/namespace/tests/test.yml | 2 +- roles/publish/README.md | 2 +- roles/publish/tests/test.yml | 2 +- roles/repository/README.md | 2 +- roles/repository/tests/test.yml | 2 +- roles/repository_sync/README.md | 2 +- roles/repository_sync/tests/test.yml | 2 +- roles/role/README.md | 2 +- roles/role/tests/test.yml | 2 +- roles/user/README.md | 2 +- roles/user/tests/test.yml | 2 +- 36 files changed, 36 insertions(+), 35 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index 664e0069..041ae1b4 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -15,6 +15,7 @@ use_default_rules: true # verbosity: 1 skip_list: - meta-unsupported-ansible + - fqcn[keyword] kinds: - playbooks: "**/examples/*.{yml,yaml}" - tasks: "**/examples/tasks/*.yml" diff --git a/.github/tests/pah_configure.yml b/.github/tests/pah_configure.yml index 9f97de39..f19135a8 100644 --- a/.github/tests/pah_configure.yml +++ b/.github/tests/pah_configure.yml @@ -11,7 +11,7 @@ pre_tasks: - name: Include Vars - include_vars: vars/pah_vars.yml + ansible.builtin.include_vars: vars/pah_vars.yml tags: - always diff --git a/roles/ansible_config/README.md b/roles/ansible_config/README.md index ebb9cb7c..2d3455c9 100644 --- a/roles/ansible_config/README.md +++ b/roles/ansible_config/README.md @@ -108,7 +108,7 @@ automation_hub_list: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ansible_config/tests/test.yml b/roles/ansible_config/tests/test.yml index 807eb474..182db944 100644 --- a/roles/ansible_config/tests/test.yml +++ b/roles/ansible_config/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/collection/README.md b/roles/collection/README.md index 49b0c869..7522d144 100644 --- a/roles/collection/README.md +++ b/roles/collection/README.md @@ -71,7 +71,7 @@ collection: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/collection/tests/test.yml b/roles/collection/tests/test.yml index 34c2b0df..dbd972fc 100644 --- a/roles/collection/tests/test.yml +++ b/roles/collection/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/dispatch/README.md b/roles/dispatch/README.md index 85942e16..0d6103a8 100644 --- a/roles/dispatch/README.md +++ b/roles/dispatch/README.md @@ -88,7 +88,7 @@ This also speeds up the overall role. Each individual role has its own variable # ah_password: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./yaml ignore_files: [ah_config.yml.template] extensions: ["yml"] diff --git a/roles/dispatch/tests/test.yml b/roles/dispatch/tests/test.yml index da7ed606..ef740846 100644 --- a/roles/dispatch/tests/test.yml +++ b/roles/dispatch/tests/test.yml @@ -6,7 +6,7 @@ pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./configs extensions: ["yml"] tags: always diff --git a/roles/ee_image/README.md b/roles/ee_image/README.md index ccfd15db..ad9d35c0 100644 --- a/roles/ee_image/README.md +++ b/roles/ee_image/README.md @@ -86,7 +86,7 @@ ah_ee_images: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_image/tests/test.yml b/roles/ee_image/tests/test.yml index a86851db..13909ba2 100644 --- a/roles/ee_image/tests/test.yml +++ b/roles/ee_image/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_namespace/README.md b/roles/ee_namespace/README.md index 2a343388..b199dd63 100644 --- a/roles/ee_namespace/README.md +++ b/roles/ee_namespace/README.md @@ -84,7 +84,7 @@ ah_ee_namespaces: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_namespace/tests/test.yml b/roles/ee_namespace/tests/test.yml index 7c523728..5f512fee 100644 --- a/roles/ee_namespace/tests/test.yml +++ b/roles/ee_namespace/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_registry/README.md b/roles/ee_registry/README.md index f71fd768..4e194d85 100644 --- a/roles/ee_registry/README.md +++ b/roles/ee_registry/README.md @@ -88,7 +88,7 @@ ah_ee_registries: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_registry/tests/test.yml b/roles/ee_registry/tests/test.yml index fdf3a8f0..9bb24ee5 100644 --- a/roles/ee_registry/tests/test.yml +++ b/roles/ee_registry/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_registry_index/README.md b/roles/ee_registry_index/README.md index d6a8a381..dc321631 100644 --- a/roles/ee_registry_index/README.md +++ b/roles/ee_registry_index/README.md @@ -84,7 +84,7 @@ ah_ee_registries: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_registry_index/tests/test.yml b/roles/ee_registry_index/tests/test.yml index 6854538f..e6135eb3 100644 --- a/roles/ee_registry_index/tests/test.yml +++ b/roles/ee_registry_index/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_registry_sync/README.md b/roles/ee_registry_sync/README.md index dc193e2e..723038f0 100644 --- a/roles/ee_registry_sync/README.md +++ b/roles/ee_registry_sync/README.md @@ -84,7 +84,7 @@ ah_ee_registries: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_registry_sync/tests/test.yml b/roles/ee_registry_sync/tests/test.yml index cf37e233..5fb6a129 100644 --- a/roles/ee_registry_sync/tests/test.yml +++ b/roles/ee_registry_sync/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_repository/README.md b/roles/ee_repository/README.md index 60bc7bdb..5bc76d19 100644 --- a/roles/ee_repository/README.md +++ b/roles/ee_repository/README.md @@ -86,7 +86,7 @@ ah_ee_repositories: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_repository/tests/test.yml b/roles/ee_repository/tests/test.yml index 58e4b4b0..206aedae 100644 --- a/roles/ee_repository/tests/test.yml +++ b/roles/ee_repository/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_repository_sync/README.md b/roles/ee_repository_sync/README.md index 94a414e1..f567ea7a 100644 --- a/roles/ee_repository_sync/README.md +++ b/roles/ee_repository_sync/README.md @@ -84,7 +84,7 @@ ah_ee_repositories: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/ee_repository_sync/tests/test.yml b/roles/ee_repository_sync/tests/test.yml index 3765ea42..1ae33b88 100644 --- a/roles/ee_repository_sync/tests/test.yml +++ b/roles/ee_repository_sync/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/group/README.md b/roles/group/README.md index cd6caad5..29ff2800 100644 --- a/roles/group/README.md +++ b/roles/group/README.md @@ -94,7 +94,7 @@ ah_groups: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/group/tests/test.yml b/roles/group/tests/test.yml index adf20ea6..1ad1dc58 100644 --- a/roles/group/tests/test.yml +++ b/roles/group/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/namespace/README.md b/roles/namespace/README.md index 58d3a95e..d7f8539d 100644 --- a/roles/namespace/README.md +++ b/roles/namespace/README.md @@ -106,7 +106,7 @@ ah_namespaces: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/namespace/tests/test.yml b/roles/namespace/tests/test.yml index 807eb474..182db944 100644 --- a/roles/namespace/tests/test.yml +++ b/roles/namespace/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/publish/README.md b/roles/publish/README.md index baebb0f9..661a0ef2 100644 --- a/roles/publish/README.md +++ b/roles/publish/README.md @@ -86,7 +86,7 @@ ah_auto_approve: true # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/publish/tests/test.yml b/roles/publish/tests/test.yml index 620343d2..e5ed7fcf 100644 --- a/roles/publish/tests/test.yml +++ b/roles/publish/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/repository/README.md b/roles/repository/README.md index fadc582d..85c20f23 100644 --- a/roles/repository/README.md +++ b/roles/repository/README.md @@ -82,7 +82,7 @@ ah_repository_community: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/repository/tests/test.yml b/roles/repository/tests/test.yml index a1e24541..4abd2dda 100644 --- a/roles/repository/tests/test.yml +++ b/roles/repository/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/repository_sync/README.md b/roles/repository_sync/README.md index 4b16477f..40cb2c0e 100644 --- a/roles/repository_sync/README.md +++ b/roles/repository_sync/README.md @@ -63,7 +63,7 @@ ah_repository_community: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/repository_sync/tests/test.yml b/roles/repository_sync/tests/test.yml index 28b00a33..992e34ab 100644 --- a/roles/repository_sync/tests/test.yml +++ b/roles/repository_sync/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/role/README.md b/roles/role/README.md index 7721d9e0..25f4c3f2 100644 --- a/roles/role/README.md +++ b/roles/role/README.md @@ -100,7 +100,7 @@ ah_roles: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/role/tests/test.yml b/roles/role/tests/test.yml index 68d9ae07..ed8f6732 100644 --- a/roles/role/tests/test.yml +++ b/roles/role/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/user/README.md b/roles/user/README.md index 5b069dbf..f0ebceb7 100644 --- a/roles/user/README.md +++ b/roles/user/README.md @@ -94,7 +94,7 @@ ah_users: # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: diff --git a/roles/user/tests/test.yml b/roles/user/tests/test.yml index d84c0992..fee0955c 100644 --- a/roles/user/tests/test.yml +++ b/roles/user/tests/test.yml @@ -10,7 +10,7 @@ # ah_token: changeme pre_tasks: - name: Include vars from ah_configs directory - include_vars: + ansible.builtin.include_vars: dir: ./vars extensions: ["yml"] tags: