From 6da3c57a8e2b5a78d62111adc77acc4d16bfbafa Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 25 Nov 2024 12:30:33 +0100 Subject: [PATCH] fixup pre-commit --- .ansible-lint | 3 +- .ansible-lint-ignore | 49 ------------------ collections/alfresco/common/meta/runtime.yml | 50 +------------------ .../alfresco/platform/meta/runtime.yml | 50 +------------------ .../roles/audit_storage/meta/main.yml | 48 ++++++------------ 5 files changed, 19 insertions(+), 181 deletions(-) delete mode 100644 .ansible-lint-ignore diff --git a/.ansible-lint b/.ansible-lint index 4d399f095..0b046a999 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,6 +1,7 @@ warn_list: - experimental # make sure new rule are returned as warnings for progressive updates - - role-name[path] # https://alfresco.atlassian.net/browse/OPSEXP-2157 + - role-name[path] # OPSEXP-2157 + - var-naming[no-role-prefix] # OPSEXP-2744 skip_list: - galaxy # To remove when/if we push to Ansible galaxy - name[template] # Allow Jinja templating inside task and play names diff --git a/.ansible-lint-ignore b/.ansible-lint-ignore deleted file mode 100644 index 91047955a..000000000 --- a/.ansible-lint-ignore +++ /dev/null @@ -1,49 +0,0 @@ -# https://hyland.atlassian.net/browse/OPSEXP-2744 -playbooks/acs.yml var-naming[no-role-prefix] -playbooks/search_replication.yml var-naming[no-role-prefix] -roles/postgres/vars/Debian.yml var-naming[no-role-prefix] -roles/postgres/vars/RedHat.yml var-naming[no-role-prefix] -roles/postgres/vars/RedHat8.yml var-naming[no-role-prefix] -roles/postgres/vars/RedHat9.yml var-naming[no-role-prefix] -roles/postgres/vars/Rocky8.yml var-naming[no-role-prefix] -roles/postgres/vars/Rocky9.yml var-naming[no-role-prefix] -roles/postgres/vars/Ubuntu20.yml var-naming[no-role-prefix] -roles/postgres/vars/Ubuntu22.yml var-naming[no-role-prefix] -roles/postgres/vars/Ubuntu18.yml var-naming[no-role-prefix] -roles/postgres/vars/main.yml var-naming[no-role-prefix] -roles/postgres/defaults/main.yml var-naming[no-role-prefix] -roles/transformers/vars/Debian.yml var-naming[no-role-prefix] -roles/transformers/vars/RedHat.yml var-naming[no-role-prefix] -roles/transformers/vars/RedHat8.yml var-naming[no-role-prefix] -roles/transformers/vars/RedHat9.yml var-naming[no-role-prefix] -roles/transformers/vars/Rocky8.yml var-naming[no-role-prefix] -roles/transformers/vars/Rocky9.yml var-naming[no-role-prefix] -roles/transformers/vars/Ubuntu20.yml var-naming[no-role-prefix] -roles/transformers/vars/Ubuntu22.yml var-naming[no-role-prefix] -roles/transformers/vars/Ubuntu18.yml var-naming[no-role-prefix] -roles/transformers/vars/main.yml var-naming[no-role-prefix] -roles/transformers/defaults/main.yml var-naming[no-role-prefix] -roles/repository/vars/Debian.yml var-naming[no-role-prefix] -roles/repository/vars/RedHat.yml var-naming[no-role-prefix] -roles/repository/vars/main.yml var-naming[no-role-prefix] -roles/repository/defaults/main.yml var-naming[no-role-prefix] -roles/search/vars/Debian.yml var-naming[no-role-prefix] -roles/search/vars/RedHat.yml var-naming[no-role-prefix] -roles/search/vars/main.yml var-naming[no-role-prefix] -roles/search/defaults/main.yml var-naming[no-role-prefix] -roles/trouter/vars/Debian.yml var-naming[no-role-prefix] -roles/trouter/vars/RedHat.yml var-naming[no-role-prefix] -roles/trouter/vars/main.yml var-naming[no-role-prefix] -roles/trouter/defaults/main.yml var-naming[no-role-prefix] -roles/sync/vars/Debian.yml var-naming[no-role-prefix] -roles/sync/vars/RedHat.yml var-naming[no-role-prefix] -roles/sync/vars/main.yml var-naming[no-role-prefix] -roles/sync/defaults/main.yml var-naming[no-role-prefix] -roles/sfs/vars/Debian.yml var-naming[no-role-prefix] -roles/sfs/vars/RedHat.yml var-naming[no-role-prefix] -roles/sfs/defaults/main.yml var-naming[no-role-prefix] -roles/nginx/defaults/main.yml var-naming[no-role-prefix] -roles/common/vars/Debian.yml var-naming[no-role-prefix] -roles/common/vars/RedHat.yml var-naming[no-role-prefix] -roles/common/vars/main.yml var-naming[no-role-prefix] -roles/common/defaults/main.yml var-naming[no-role-prefix] diff --git a/collections/alfresco/common/meta/runtime.yml b/collections/alfresco/common/meta/runtime.yml index 20f709edf..cbf39f305 100644 --- a/collections/alfresco/common/meta/runtime.yml +++ b/collections/alfresco/common/meta/runtime.yml @@ -1,52 +1,4 @@ --- # Collections must specify a minimum required ansible version to upload # to galaxy -# requires_ansible: '>=2.9.10' - -# Content that Ansible needs to load from another location or that has -# been deprecated/removed -# plugin_routing: -# action: -# redirected_plugin_name: -# redirect: ns.col.new_location -# deprecated_plugin_name: -# deprecation: -# removal_version: "4.0.0" -# warning_text: | -# See the porting guide on how to update your playbook to -# use ns.col.another_plugin instead. -# removed_plugin_name: -# tombstone: -# removal_version: "2.0.0" -# warning_text: | -# See the porting guide on how to update your playbook to -# use ns.col.another_plugin instead. -# become: -# cache: -# callback: -# cliconf: -# connection: -# doc_fragments: -# filter: -# httpapi: -# inventory: -# lookup: -# module_utils: -# modules: -# netconf: -# shell: -# strategy: -# terminal: -# test: -# vars: - -# Python import statements that Ansible needs to load from another location -# import_redirection: -# ansible_collections.ns.col.plugins.module_utils.old_location: -# redirect: ansible_collections.ns.col.plugins.module_utils.new_location - -# Groups of actions/modules that take a common set of options -# action_groups: -# group_name: -# - module1 -# - module2 +requires_ansible: '>=2.14.0' diff --git a/collections/alfresco/platform/meta/runtime.yml b/collections/alfresco/platform/meta/runtime.yml index 20f709edf..cbf39f305 100644 --- a/collections/alfresco/platform/meta/runtime.yml +++ b/collections/alfresco/platform/meta/runtime.yml @@ -1,52 +1,4 @@ --- # Collections must specify a minimum required ansible version to upload # to galaxy -# requires_ansible: '>=2.9.10' - -# Content that Ansible needs to load from another location or that has -# been deprecated/removed -# plugin_routing: -# action: -# redirected_plugin_name: -# redirect: ns.col.new_location -# deprecated_plugin_name: -# deprecation: -# removal_version: "4.0.0" -# warning_text: | -# See the porting guide on how to update your playbook to -# use ns.col.another_plugin instead. -# removed_plugin_name: -# tombstone: -# removal_version: "2.0.0" -# warning_text: | -# See the porting guide on how to update your playbook to -# use ns.col.another_plugin instead. -# become: -# cache: -# callback: -# cliconf: -# connection: -# doc_fragments: -# filter: -# httpapi: -# inventory: -# lookup: -# module_utils: -# modules: -# netconf: -# shell: -# strategy: -# terminal: -# test: -# vars: - -# Python import statements that Ansible needs to load from another location -# import_redirection: -# ansible_collections.ns.col.plugins.module_utils.old_location: -# redirect: ansible_collections.ns.col.plugins.module_utils.new_location - -# Groups of actions/modules that take a common set of options -# action_groups: -# group_name: -# - module1 -# - module2 +requires_ansible: '>=2.14.0' diff --git a/collections/alfresco/platform/roles/audit_storage/meta/main.yml b/collections/alfresco/platform/roles/audit_storage/meta/main.yml index e014894eb..157e3d462 100644 --- a/collections/alfresco/platform/roles/audit_storage/meta/main.yml +++ b/collections/alfresco/platform/roles/audit_storage/meta/main.yml @@ -1,43 +1,25 @@ galaxy_info: - author: your name - description: your role description - company: your company (optional) + author: Alfresco Ops Readiness + description: This role installs and configures the audit storage for Alfresco + company: Hyland Software # If the issue tracker for your role is not on github, uncomment the # next line and provide a value # issue_tracker_url: http://example.com/issue/tracker - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) + license: Apache-2.0 - min_ansible_version: 2.1 + min_ansible_version: "2.12" - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 + platforms: + - name: Ubuntu + versions: + - bionic + - focal + - name: EL + versions: + - "8" + - "9" galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes @@ -48,4 +30,4 @@ galaxy_info: # Maximum 20 tags per role. dependencies: - - alfresco.platform.common + - role: alfresco.platform.common