From 381226235a24c1c20b905bd2a0b8c84bbc7dccfd Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Fri, 17 May 2024 09:12:32 +0200 Subject: [PATCH 1/3] Update to 15.0.2 / 8.4.8 + linter pass --- roles/infinispan/defaults/main.yml | 2 +- roles/infinispan/meta/argument_specs.yml | 4 +-- roles/infinispan/tasks/fastpackages.yml | 9 +++--- roles/infinispan/tasks/firewalld.yml | 6 ++-- roles/infinispan/tasks/install.yml | 38 ++++++++++++------------ roles/infinispan/tasks/jdg_user.yml | 8 ++--- roles/infinispan/tasks/main.yml | 35 ++++++++++++---------- roles/infinispan/tasks/prereqs.yml | 4 +-- roles/infinispan/tasks/query_cache.yml | 2 +- roles/infinispan/tasks/restart.yml | 4 +-- roles/infinispan/tasks/start.yml | 6 ++-- roles/infinispan/tasks/systemd.yml | 8 ++--- roles/infinispan/vars/main.yml | 8 ----- 13 files changed, 65 insertions(+), 69 deletions(-) diff --git a/roles/infinispan/defaults/main.yml b/roles/infinispan/defaults/main.yml index 42f646d..df92d6d 100644 --- a/roles/infinispan/defaults/main.yml +++ b/roles/infinispan/defaults/main.yml @@ -1,5 +1,5 @@ --- -infinispan_version: "14.0.21.Final" +infinispan_version: "15.0.2.Final" infinispan_bundle: "infinispan-server-{{ infinispan_version }}.zip" infinispan_download_url: "https://downloads.jboss.org/infinispan/{{ infinispan_version }}/{{ infinispan_bundle }}" infinispan_dest: /opt/infinispan diff --git a/roles/infinispan/meta/argument_specs.yml b/roles/infinispan/meta/argument_specs.yml index 2931c0f..7229967 100644 --- a/roles/infinispan/meta/argument_specs.yml +++ b/roles/infinispan/meta/argument_specs.yml @@ -10,7 +10,7 @@ argument_specs: description: "Ensure firewalld is running and configure infinispan/datagrid ports" type: "bool" infinispan_version: - default: "14.0.19.Final" + default: "15.0.2.Final" description: "Infinispan version to install" type: "str" infinispan_bundle: @@ -203,7 +203,7 @@ argument_specs: downstream: options: data_grid_version: - default: "8.4.6" + default: "8.4.8" description: "Red Hat Data Grid version to install" type: "str" data_grid_installation_path: diff --git a/roles/infinispan/tasks/fastpackages.yml b/roles/infinispan/tasks/fastpackages.yml index cfd9025..86381ab 100644 --- a/roles/infinispan/tasks/fastpackages.yml +++ b/roles/infinispan/tasks/fastpackages.yml @@ -2,15 +2,16 @@ - name: "Check if packages are already installed" # noqa command-instead-of-module this runs faster ansible.builtin.command: "rpm -q {{ packages_list | join(' ') }}" register: rpm_info - changed_when: False - failed_when: False + changed_when: false + failed_when: false - name: "Add missing packages to the yum install list" ansible.builtin.set_fact: - packages_to_install: "{{ packages_to_install | default([]) + rpm_info.stdout_lines | map('regex_findall', 'package (.+) is not installed$') | default([]) | flatten }}" + packages_to_install: "{{ packages_to_install | default([]) + rpm_info.stdout_lines | \ + map('regex_findall', 'package (.+) is not installed$') | default([]) | flatten }}" - name: "Install packages: {{ packages_to_install }}" - become: True + become: true ansible.builtin.yum: name: "{{ packages_to_install }}" state: present diff --git a/roles/infinispan/tasks/firewalld.yml b/roles/infinispan/tasks/firewalld.yml index e7502ad..2eaf57e 100644 --- a/roles/infinispan/tasks/firewalld.yml +++ b/roles/infinispan/tasks/firewalld.yml @@ -6,14 +6,14 @@ - firewalld - name: Enable and start the firewalld service - become: yes + become: true ansible.builtin.systemd: name: firewalld - enabled: yes + enabled: true state: started - name: "Configure firewall for {{ infinispan.name }} ports" - become: yes + become: true ansible.posix.firewalld: port: "{{ item }}" permanent: true diff --git a/roles/infinispan/tasks/install.yml b/roles/infinispan/tasks/install.yml index 2f257f1..01fea07 100644 --- a/roles/infinispan/tasks/install.yml +++ b/roles/infinispan/tasks/install.yml @@ -4,14 +4,14 @@ name: "{{ infinispan.group.name }}" state: present gid: "{{ infinispan.group.id | default(omit) }}" - become: yes + become: true - name: "Create user {{ infinispan.user.name }}" ansible.builtin.user: name: "{{ infinispan.user.name }}" state: present uid: "{{ infinispan.user.id | default(omit) }}" - become: yes + become: true - name: "Create download directory" ansible.builtin.file: @@ -19,8 +19,8 @@ state: directory owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" - mode: 0750 - become: yes + mode: '0750' + become: true ## check remote archive - name: Set download archive path @@ -31,7 +31,7 @@ ansible.builtin.stat: path: "{{ archive }}" register: archive_path - become: yes + become: true - name: Check local download archive path ansible.builtin.stat: @@ -44,7 +44,7 @@ ansible.builtin.get_url: # noqa risky-file-permissions delegated, uses controller host user url: "{{ infinispan_download_url }}" dest: "{{ local_path.stat.path }}/{{ infinispan.bundle }}" - mode: 0644 + mode: '0644' delegate_to: localhost when: - archive_path is defined @@ -55,7 +55,7 @@ - name: Download Red Hat Data Grid from RHN using JBoss Network API delegate_to: localhost - run_once: yes + run_once: true when: - archive_path is defined - archive_path.stat is defined @@ -73,13 +73,13 @@ product_category: "{{ data_grid_product_category }}" register: rhn_products delegate_to: localhost - run_once: yes + run_once: true - name: Determine install zipfile from search results ansible.builtin.set_fact: rhn_filtered_products: "{{ rhn_products.results | selectattr('file_path', 'match', '.*/redhat-datagrid-' + data_grid_version + '-server.zip') }}" delegate_to: localhost - run_once: yes + run_once: true - name: Download Data Grid middleware_automation.common.product_download: @@ -89,13 +89,13 @@ dest: "{{ local_path.stat.path }}/{{ infinispan.bundle }}" no_log: "{{ omit_rhn_output | default(true) }}" delegate_to: localhost - run_once: yes + run_once: true - name: Download Data Grid archive from alternate location ansible.builtin.get_url: # noqa risky-file-permissions delegated, uses controller host user url: "{{ infinispan_download_url }}" dest: "{{ local_path.stat.path }}/{{ infinispan.bundle }}" - mode: 0644 + mode: '0644' delegate_to: localhost when: - jdg_download_url is defined and jdg_download_url | length > 0 @@ -120,18 +120,18 @@ dest: "{{ archive }}" owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" - mode: 0640 + mode: '0640' register: new_version_downloaded when: - local_archive_path.stat is defined - local_archive_path.stat.exists - become: yes + become: true - name: "Check target directory: {{ infinispan.installation_path }}" ansible.builtin.stat: path: "{{ infinispan.installation_path }}/bin" register: path_to_workdir - become: yes + become: true - name: "Create target directory {{ infinispan.installation_path | dirname }}" ansible.builtin.file: @@ -139,18 +139,18 @@ path: "{{ infinispan.installation_path | dirname }}" owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" - mode: 0750 - become: yes + mode: '0750' + become: true - name: "Extract {{ infinispan.name }} archive on target {{ infinispan.installation_path }}" ansible.builtin.unarchive: - remote_src: yes + remote_src: true src: "{{ archive }}" dest: "{{ infinispan.installation_path | dirname | dirname }}" creates: "{{ infinispan.installation_path }}/bin" owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" - become: yes + become: true when: - new_version_downloaded.changed or not path_to_workdir.stat.exists notify: @@ -168,5 +168,5 @@ owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" recurse: true - become: yes + become: true changed_when: false diff --git a/roles/infinispan/tasks/jdg_user.yml b/roles/infinispan/tasks/jdg_user.yml index bd1a1a5..94f7c4f 100644 --- a/roles/infinispan/tasks/jdg_user.yml +++ b/roles/infinispan/tasks/jdg_user.yml @@ -12,10 +12,10 @@ dest: "{{ infinispan.home }}/server/conf/{{ infinispan.config.users }}" owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" - mode: 0644 + mode: '0644' notify: - restart infinispan - become: yes + become: true - name: "Ensure {{ infinispan.config.groups }} exists" ansible.builtin.template: @@ -23,7 +23,7 @@ dest: "{{ infinispan.home }}/server/conf/{{ infinispan.config.groups }}" owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" - mode: 0644 + mode: '0644' notify: - restart infinispan - become: yes + become: true diff --git a/roles/infinispan/tasks/main.yml b/roles/infinispan/tasks/main.yml index e322f4d..d028ddf 100644 --- a/roles/infinispan/tasks/main.yml +++ b/roles/infinispan/tasks/main.yml @@ -62,7 +62,10 @@ loop: "{{ ansible_play_batch }}" vars: host_iface: "{{ 'ansible_' + infinispan_jgroups_iface }}" - host_address: "{{ hostvars[item][host_iface]['address'] | default(hostvars[item][host_iface]['ipv4']['address'] | default(hostvars[item]['ansible_host'])) }}" + host_address: "{{ hostvars[item][host_iface]['address'] | \ + default(hostvars[item][host_iface]['ipv4']['address'] | \ + default(hostvars[item]['ansible_host']) | \ + default(hostvars[item]['inventory_hostname_short'])) }}" host_port: "{{ (((infinispan_jgroups_port | int + infinispan_port_offset | int) | abs) | string) }}" host_site: "{{ hostvars[item]['infinispan_jgroups_relay_site'] | default(infinispan_jgroups_relay_site) if infinispan_jgroups_relay else '' }}" when: @@ -86,21 +89,21 @@ dest: "{{ infinispan.home }}/bin/server.conf" owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" - mode: 0644 - backup: yes + mode: '0644' + backup: true vars: jdg_rpm_java_home: "{{ rpm_java_home }}" notify: - restart infinispan - become: yes + become: true - name: "Get xsd schema versions" ansible.builtin.find: paths: "{{ infinispan.home }}/docs/schema/" - use_regex: yes + use_regex: true patterns: ['^.*-server-[0-9.]*[.]xsd$'] register: server_schema - become: yes + become: true - name: "Set fetched schema version for template" ansible.builtin.set_fact: @@ -112,11 +115,11 @@ dest: "{{ infinispan.home }}/server/conf/{{ infinispan.config.name }}" owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" - mode: 0644 - backup: yes + mode: '0644' + backup: true notify: - restart infinispan - become: yes + become: true - name: "Ensure {{ infinispan.service.name }} log4j2 configuration is deployed" ansible.builtin.template: @@ -124,11 +127,11 @@ dest: "{{ infinispan.home }}/server/conf/log4j2.xml" owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" - mode: 0644 - backup: yes + mode: '0644' + backup: true notify: - restart infinispan - become: yes + become: true - name: Download database driver jar to target ansible.builtin.get_url: @@ -136,10 +139,10 @@ dest: "{{ infinispan.home }}/lib/{{ infinispan_jgroups_jdbc[infinispan_jdbc_engine].driver_jar_filename }}" owner: "{{ infinispan.user.name }}" group: "{{ infinispan.group.name }}" - mode: 0644 + mode: '0644' when: - infinispan_jgroups_discovery == 'JDBC_PING' - become: yes + become: true - name: Include users tasks ansible.builtin.include_tasks: jdg_user.yml @@ -151,7 +154,7 @@ - name: "Ensure {{ infinispan.service.name }} service is running and enabled (first node)" ansible.builtin.include_tasks: start.yml - run_once: yes + run_once: true when: infinispan_jgroups_discovery == 'JDBC_PING' or infinispan_keycloak_persistence - name: "Ensure {{ infinispan.service.name }} service is running and enabled (all nodes)" @@ -163,4 +166,4 @@ src: "{{ infinispan.home }}server/log" dest: "/var/log/infinispan{{ '-' + infinispan_nodename if infinispan_nodename != inventory_hostname else '' }}" force: true - become: yes + become: true diff --git a/roles/infinispan/tasks/prereqs.yml b/roles/infinispan/tasks/prereqs.yml index 56e8f34..dbdd717 100644 --- a/roles/infinispan/tasks/prereqs.yml +++ b/roles/infinispan/tasks/prereqs.yml @@ -4,7 +4,7 @@ that: - (rhn_username is defined and data_grid_enable is defined and data_grid_enable) or not data_grid_enable is defined or not data_grid_enable or infinispan_offline_install - (rhn_password is defined and data_grid_enable is defined and data_grid_enable) or not data_grid_enable is defined or not data_grid_enable or infinispan_offline_install - quiet: True + quiet: true fail_msg: "Cannot install {{ infinispan.name }} without RHN credentials. Check rhn_username and rhn_password are defined" success_msg: "Installing {{ infinispan_service_desc }}" @@ -12,7 +12,7 @@ ansible.builtin.assert: that: - infinispan_supervisor_password | length > 12 - quiet: True + quiet: true fail_msg: "The console administrator password is empty or invalid. Please set the infinispan_supervisor_password variable to a 12+ char long string" success_msg: "{{ 'Console administrator password OK' }}" diff --git a/roles/infinispan/tasks/query_cache.yml b/roles/infinispan/tasks/query_cache.yml index 20da072..7ad9e03 100644 --- a/roles/infinispan/tasks/query_cache.yml +++ b/roles/infinispan/tasks/query_cache.yml @@ -14,5 +14,5 @@ method: "{{ method }}" user: "{{ jdg_username | default(omit) }}" password: "{{ jdg_password | default(omit) }}" - force_basic_auth: yes + force_basic_auth: true status_code: 200 diff --git a/roles/infinispan/tasks/restart.yml b/roles/infinispan/tasks/restart.yml index 77de7a7..5463dd5 100644 --- a/roles/infinispan/tasks/restart.yml +++ b/roles/infinispan/tasks/restart.yml @@ -6,11 +6,11 @@ ansible.builtin.systemd: name: "{{ infinispan.service.unit_file }}" state: restarted - become: yes + become: true - name: "Wait for used port to be open" ansible.builtin.wait_for: port: "{{ infinispan.port }}" delay: 0 when: - infinispan_healthcheck - become: yes + become: true diff --git a/roles/infinispan/tasks/start.yml b/roles/infinispan/tasks/start.yml index a593a61..0479d55 100644 --- a/roles/infinispan/tasks/start.yml +++ b/roles/infinispan/tasks/start.yml @@ -5,12 +5,12 @@ ansible.builtin.systemd: name: "{{ infinispan.service.unit_file }}" state: started - enabled: yes - become: yes + enabled: true + become: true - name: "Wait for used port to be open" ansible.builtin.wait_for: port: "{{ infinispan.port }}" delay: 0 when: - infinispan_healthcheck - become: yes + become: true diff --git a/roles/infinispan/tasks/systemd.yml b/roles/infinispan/tasks/systemd.yml index 7dc72ca..bc88bf1 100644 --- a/roles/infinispan/tasks/systemd.yml +++ b/roles/infinispan/tasks/systemd.yml @@ -4,16 +4,16 @@ dest: "{{ infinispan.service.unit_dir }}/{{ infinispan.service.unit_file }}.service" owner: root group: root - mode: 0644 - become: yes + mode: '0644' + become: true register: ispn_daemon_reload notify: - restart infinispan - name: "Perform daemon-reload to ensure the changes on {{ infinispan.service.name }} service are picked up" ansible.builtin.systemd: - daemon_reload: yes + daemon_reload: true when: - ispn_daemon_reload is defined - ispn_daemon_reload.changed - become: yes + become: true diff --git a/roles/infinispan/vars/main.yml b/roles/infinispan/vars/main.yml index cecc46f..3cba68e 100644 --- a/roles/infinispan/vars/main.yml +++ b/roles/infinispan/vars/main.yml @@ -6,14 +6,6 @@ infinispan_users: [] # internal variables infinispan_rest_cache_api_path: /rest/v2/caches/ # noqa no_unspecified_argument -infinispan_rhn_ids: - '8.2.0': '98151' # noqa vars_in_vars_files_have_valid_names - '8.2.2': '103685' # noqa vars_in_vars_files_have_valid_names - '8.2.3': '103907' # noqa vars_in_vars_files_have_valid_names - '8.3.0': '104135' # noqa vars_in_vars_files_have_valid_names - '8.3.1': '104475' # noqa vars_in_vars_files_have_valid_names - '8.4.0': '104901' # noqa vars_in_vars_files_have_valid_names - infinispan_supervisor: name: 'supervisor' password: "{{ infinispan_supervisor_password }}" From d7439e3464d4e2c988c0f279eff60d50c12b29fb Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Fri, 17 May 2024 09:16:08 +0200 Subject: [PATCH 2/3] update yamllint --- .yamllint | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.yamllint b/.yamllint index fa1f1fc..41658d3 100644 --- a/.yamllint +++ b/.yamllint @@ -15,7 +15,8 @@ rules: commas: max-spaces-after: -1 level: error - comments: disable + comments: + min-spaces-from-content: 1 comments-indentation: disable document-start: disable empty-lines: @@ -30,4 +31,7 @@ rules: new-lines: type: unix trailing-spaces: disable - truthy: disable \ No newline at end of file + truthy: disable + octal-values: + forbid-implicit-octal: true + forbid-explicit-octal: true From b002e962124a3e4cf4e0d4163a0eb456d3c50712 Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Fri, 17 May 2024 09:22:31 +0200 Subject: [PATCH 3/3] udpate application/x-protostream to application/octet-stream --- molecule/default/converge.yml | 9 ++++----- playbooks/infinispan.yml | 4 ++-- roles/infinispan/defaults/main.yml | 2 +- roles/infinispan/templates/distributed-cache.j2 | 4 ++-- roles/infinispan/templates/replicated-cache.j2 | 4 ++-- roles/infinispan_cache/templates/distributed-cache.j2 | 4 ++-- roles/infinispan_cache/templates/replicated-cache.j2 | 4 ++-- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index f13d48f..9d6d040 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -12,7 +12,7 @@ infinispan_caches: - cache_xml: > - + - cache_config: name: configuredstaticcache @@ -31,7 +31,7 @@ infinispan_caches: - cache_xml: > - + - cache_config: name: configuredstaticcache @@ -44,7 +44,7 @@ infinispan_deployer_password: "remembertochangeme" infinispan_cache_xml: > - + - role: infinispan_cache infinispan_deployer_user: "supervisor" @@ -81,5 +81,4 @@ statistics: false indexing: true indexing_entities: - - org.infinispan.sample.Car - - book_sample.Book + - org.infinispan.server.configuration.AddressType diff --git a/playbooks/infinispan.yml b/playbooks/infinispan.yml index 1e731b5..22aa05e 100644 --- a/playbooks/infinispan.yml +++ b/playbooks/infinispan.yml @@ -12,5 +12,5 @@ infinispan_deployer_password: "remembertochangeme" infinispan_cache_xml: > - - \ No newline at end of file + + diff --git a/roles/infinispan/defaults/main.yml b/roles/infinispan/defaults/main.yml index df92d6d..42f646d 100644 --- a/roles/infinispan/defaults/main.yml +++ b/roles/infinispan/defaults/main.yml @@ -1,5 +1,5 @@ --- -infinispan_version: "15.0.2.Final" +infinispan_version: "14.0.21.Final" infinispan_bundle: "infinispan-server-{{ infinispan_version }}.zip" infinispan_download_url: "https://downloads.jboss.org/infinispan/{{ infinispan_version }}/{{ infinispan_bundle }}" infinispan_dest: /opt/infinispan diff --git a/roles/infinispan/templates/distributed-cache.j2 b/roles/infinispan/templates/distributed-cache.j2 index e1b00ce..299cdec 100644 --- a/roles/infinispan/templates/distributed-cache.j2 +++ b/roles/infinispan/templates/distributed-cache.j2 @@ -9,7 +9,7 @@ unreliable-return-values="{{ cache_config.unreliable_return_values|default('false')|lower }}"> - + {% endif %} - \ No newline at end of file + diff --git a/roles/infinispan/templates/replicated-cache.j2 b/roles/infinispan/templates/replicated-cache.j2 index 4163519..98455e6 100644 --- a/roles/infinispan/templates/replicated-cache.j2 +++ b/roles/infinispan/templates/replicated-cache.j2 @@ -5,7 +5,7 @@ unreliable-return-values="{{ cache_config.unreliable_return_values|default('false')|lower }}"> - + {% endif %} - \ No newline at end of file + diff --git a/roles/infinispan_cache/templates/distributed-cache.j2 b/roles/infinispan_cache/templates/distributed-cache.j2 index 87156bc..312fcd5 100644 --- a/roles/infinispan_cache/templates/distributed-cache.j2 +++ b/roles/infinispan_cache/templates/distributed-cache.j2 @@ -9,7 +9,7 @@ unreliable-return-values="{{ infinispan_cache_config.unreliable_return_values|default('false')|lower }}"> - + {% endif %} - \ No newline at end of file + diff --git a/roles/infinispan_cache/templates/replicated-cache.j2 b/roles/infinispan_cache/templates/replicated-cache.j2 index 9884ea9..8c03e67 100644 --- a/roles/infinispan_cache/templates/replicated-cache.j2 +++ b/roles/infinispan_cache/templates/replicated-cache.j2 @@ -5,7 +5,7 @@ unreliable-return-values="{{ infinispan_cache_config.unreliable_return_values|default('false')|lower }}"> - + {% endif %} - \ No newline at end of file +