OPSEXP-3106: miscellaneous var cleanup (#1117)

Author: alxgomz

.ansible-lint-ignore

@@ -1,27 +1,3 @@
-# https://hyland.atlassian.net/browse/OPSEXP-2744
-playbooks/acs.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/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/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/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/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]

playbooks/acs.yml

@@ -117,7 +117,7 @@
         name: "../roles/activemq"
       vars:
         activemq_version: "{{ acs_play_activemq_version }}"
-        java_version: "{{ acs_play_java_version }}"
+        java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
       when: not groups.external_activemq | default([])
   tags:
     - activemq
@@ -196,7 +196,7 @@
         name: "../roles/transformers"
       vars:
         transformers_ats_keystore: "{{ transformers_keystore | default({}) }}"
-        java_version: "{{ acs_play_java_version }}"
+        java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
         transformers_acs_is_enterprise: "{{ acs_is_enterprise }}"
         transformers_libreoffice_version: "{{ acs_play_transformers_libreoffice_version }}"
         transformers_libreoffice_archive_url: "{{ acs_play_transformers_libreoffice_archive_url }}"
@@ -236,15 +236,15 @@
       ansible.builtin.import_role:
         name: "../roles/search"
       vars:
-        java_version: "{{ acs_play_java_version }}"
+        java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
         search_version: "{{ acs_play_search_version }}"
         search_flavor: >-
           {{ 'alfresco-insight-engine' if 'insight-engine' in acs_play_search_artifact_name else 'alfresco-search-services' }}
         search_zip_url: "{{ acs_play_search_download_zip_url }}"
         search_zip_checksum_url: "{{ acs_play_search_download_zip_sha1_checksum_url }}"
         search_master_host: "{{ solr_host }}"
         search_shared_secret: "{{ reposearch_shared_secret }}"
-        alfresco:
+        search_repository:
           host: "{{ nginx_host }}"
           port: "{{ ports_cfg.nginx.http }}"
           port_ssl: "{{ ports_cfg.nginx.https }}"
@@ -322,7 +322,7 @@
       ansible.builtin.import_role:
         name: "../roles/repository"
       vars:
-        java_version: "{{ acs_play_java_version }}"
+        java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
         repository_trusted_urls: "{{ acs_play_trusted_urls }}"
         repository_default_keystore: "{{ repository_keystore | default({}) }}"
         repository_use_ssl: "{{ acs_play_use_ssl }}"
@@ -331,7 +331,7 @@
         repository_properties: "{{ global_properties }}"
         repository_raw_properties: "{{ properties_snippets }}"
         repository_identity_url: "{{ identity_url | default('') }}"
-        tomcat_version: "{{ acs_play_tomcat_version }}"
+        tomcat_version: "{{ acs_play_tomcat_version }}" # noqa: var-naming[no-role-prefix]
         repository_nexus_username: "{{ nexus_user }}"
         repository_nexus_password: "{{ nexus_password }}"
         repository_db_url: "{{ acs_play_repo_db_url }}"
@@ -430,7 +430,7 @@
       ansible.builtin.import_role:
         name: "../roles/trouter"
       vars:
-        java_version: "{{ acs_play_java_version }}"
+        java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
         trouter_ats_keystore: "{{ acs_play_trouter_keystore | default({}) }}"
         trouter_version: "{{ acs_play_trouter_version }}"
         trouter_zip_url: "{{ acs_play_trouter_download_zip_url }}"
@@ -480,7 +480,7 @@
       ansible.builtin.import_role:
         name: "../roles/sfs"
       vars:
-        java_version: "{{ acs_play_java_version }}"
+        java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
         sfs_version: "{{ acs_play_sfs_version }}"
         sfs_zip_url: "{{ acs_play_sfs_download_zip_url }}"
         sfs_zip_checksum_url: "{{ acs_play_sfs_download_zip_sha1_checksum_url }}"
@@ -516,7 +516,7 @@
       ansible.builtin.import_role:
         name: "../roles/search_enterprise"
       vars:
-        java_version: "{{ acs_play_java_version }}"
+        java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
         search_enterprise_repo_db_url: "{{ acs_play_repo_db_url }}"
         search_enterprise_repo_db_name: "{{ acs_play_repo_db_name }}"
         search_enterprise_repo_db_username: "{{ acs_play_repo_db_username }}"
@@ -656,7 +656,7 @@
       ansible.builtin.import_role:
         name: "../roles/sync"
       vars:
-        java_version: "{{ acs_play_java_version }}"
+        java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
         sync_version: "{{ acs_play_sync_version }}"
         sync_zip_url: "{{ acs_play_sync_zip_url }}"
         sync_zip_checksum: "{{ acs_play_sync_zip_sha1_checksum }}"
@@ -706,7 +706,7 @@
       ansible.builtin.import_role:
         name: "../roles/audit_storage"
       vars:
-        java_version: "{{ acs_play_java_version }}"
+        java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
         audit_storage_version: "{{ acs_play_audit_storage_version }}"
         audit_storage_zip_url: "{{ audit_storage_download_zip_url }}"
         audit_storage_zip_checksum_url: "{{ audit_storage_download_zip_sha1_checksum_url }}"

roles/transformers/tasks/main.yml

@@ -55,7 +55,7 @@
 
     - name: Install optional ghostscript packages (AGPL)
       ansible.builtin.package:
-        name: "{{ ghostscript_packages }}"
+        name: "{{ transformers_gs_packages }}"
         state: present
       when: transformers_include_ghostscript
 

roles/transformers/vars/main.yml

@@ -1,4 +1,4 @@
 ---
 # vars file for transformers
-ghostscript_packages:
+transformers_gs_packages:
   - ghostscript