From 9d56a54bd82df1eb56bacc9b393ed4bb41f4bfc1 Mon Sep 17 00:00:00 2001 From: Martin Cihlar Date: Thu, 10 Sep 2026 13:26:02 +0200 Subject: [PATCH] AMW-628 Replace deprecated top-level fact variables with ansible_facts syntax --- roles/keycloak/tasks/install.yml | 4 ++-- roles/keycloak/tasks/main.yml | 2 +- roles/keycloak/tasks/prereqs.yml | 8 ++++---- .../templates/15.0.8/standalone-infinispan.xml.j2 | 4 ++-- .../keycloak/templates/9.0.2/standalone-infinispan.xml.j2 | 4 ++-- roles/keycloak/templates/standalone-ha.xml.j2 | 4 ++-- roles/keycloak/templates/standalone-infinispan.xml.j2 | 4 ++-- roles/keycloak_quarkus/README.md | 2 +- roles/keycloak_quarkus/defaults/main.yml | 2 +- roles/keycloak_quarkus/meta/argument_specs.yml | 2 +- roles/keycloak_quarkus/tasks/main.yml | 2 +- roles/keycloak_quarkus/tasks/prereqs.yml | 8 ++++---- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/roles/keycloak/tasks/install.yml b/roles/keycloak/tasks/install.yml index 139d001..155ecd3 100644 --- a/roles/keycloak/tasks/install.yml +++ b/roles/keycloak/tasks/install.yml @@ -256,8 +256,8 @@ { "name": item, "address": 'jgroups-' + item, - "inventory_host": hostvars[item].ansible_default_ipv4.address | default(item) + '[' + (keycloak_jgroups_port | string) + ']', - "value": hostvars[item].ansible_default_ipv4.address | default(item) + "inventory_host": hostvars[item].ansible_facts['default_ipv4']['address'] | default(item) + '[' + (keycloak_jgroups_port | string) + ']', + "value": hostvars[item].ansible_facts['default_ipv4']['address'] | default(item) } ] }} loop: "{{ ansible_play_batch }}" diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml index c840a1b..e59229d 100644 --- a/roles/keycloak/tasks/main.yml +++ b/roles/keycloak/tasks/main.yml @@ -11,7 +11,7 @@ - name: Distro specific tasks ansible.builtin.include_tasks: - file: "{{ ansible_os_family | lower }}.yml" + file: "{{ ansible_facts['os_family'] | lower }}.yml" apply: tags: - unbound diff --git a/roles/keycloak/tasks/prereqs.yml b/roles/keycloak/tasks/prereqs.yml index 7e2e8e3..517e2c6 100644 --- a/roles/keycloak/tasks/prereqs.yml +++ b/roles/keycloak/tasks/prereqs.yml @@ -42,13 +42,13 @@ - name: Validate OS family ansible.builtin.assert: that: - - ansible_os_family in ["RedHat", "Debian"] + - ansible_facts['os_family'] in ["RedHat", "Debian"] quiet: true - fail_msg: "Can only install on RedHat or Debian OS families; found {{ ansible_os_family }}" - success_msg: "Installing on {{ ansible_os_family }}" + fail_msg: "Can only install on RedHat or Debian OS families; found {{ ansible_facts['os_family'] }}" + success_msg: "Installing on {{ ansible_facts['os_family'] }}" - name: Load OS specific variables - ansible.builtin.include_vars: "vars/{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "vars/{{ ansible_facts['os_family'] | lower }}.yml" tags: - always diff --git a/roles/keycloak/templates/15.0.8/standalone-infinispan.xml.j2 b/roles/keycloak/templates/15.0.8/standalone-infinispan.xml.j2 index 25d6cb0..0a5c632 100644 --- a/roles/keycloak/templates/15.0.8/standalone-infinispan.xml.j2 +++ b/roles/keycloak/templates/15.0.8/standalone-infinispan.xml.j2 @@ -727,8 +727,8 @@ -{% if ansible_default_ipv4 is defined %} - +{% if ansible_facts['default_ipv4'] is defined %} + {% else %} {% endif %} diff --git a/roles/keycloak/templates/9.0.2/standalone-infinispan.xml.j2 b/roles/keycloak/templates/9.0.2/standalone-infinispan.xml.j2 index 4f90ad8..fa8c67d 100644 --- a/roles/keycloak/templates/9.0.2/standalone-infinispan.xml.j2 +++ b/roles/keycloak/templates/9.0.2/standalone-infinispan.xml.j2 @@ -724,8 +724,8 @@ -{% if ansible_default_ipv4 is defined %} - +{% if ansible_facts['default_ipv4'] is defined %} + {% else %} {% endif %} diff --git a/roles/keycloak/templates/standalone-ha.xml.j2 b/roles/keycloak/templates/standalone-ha.xml.j2 index d027c35..d7ca8eb 100644 --- a/roles/keycloak/templates/standalone-ha.xml.j2 +++ b/roles/keycloak/templates/standalone-ha.xml.j2 @@ -664,8 +664,8 @@ {% if keycloak_jgroups_subnet is defined and keycloak_jgroups_subnet is not none and keycloak_jgroups_subnet | string | length > 0 %} -{% elif ansible_default_ipv4 is defined and (ansible_default_ipv4.network + '/' + ansible_default_ipv4.netmask) | ansible.utils.ipaddr('net') | length > 0 %} - +{% elif ansible_facts['default_ipv4'] is defined and (ansible_facts['default_ipv4']['network'] + '/' + ansible_facts['default_ipv4']['netmask']) | ansible.utils.ipaddr('net') | length > 0 %} + {% else %} {% endif %} diff --git a/roles/keycloak/templates/standalone-infinispan.xml.j2 b/roles/keycloak/templates/standalone-infinispan.xml.j2 index 18e5a7c..78c0062 100644 --- a/roles/keycloak/templates/standalone-infinispan.xml.j2 +++ b/roles/keycloak/templates/standalone-infinispan.xml.j2 @@ -702,8 +702,8 @@ {% if keycloak_jgroups_subnet is defined and keycloak_jgroups_subnet is not none and keycloak_jgroups_subnet | string | length > 0 %} -{% elif ansible_default_ipv4 is defined and (ansible_default_ipv4.network + '/' + ansible_default_ipv4.netmask) | ansible.utils.ipaddr('net') | length > 0 %} - +{% elif ansible_facts['default_ipv4'] is defined and (ansible_facts['default_ipv4']['network'] + '/' + ansible_facts['default_ipv4']['netmask']) | ansible.utils.ipaddr('net') | length > 0 %} + {% else %} {% endif %} diff --git a/roles/keycloak_quarkus/README.md b/roles/keycloak_quarkus/README.md index b104e23..2e3badb 100644 --- a/roles/keycloak_quarkus/README.md +++ b/roles/keycloak_quarkus/README.md @@ -79,7 +79,7 @@ Role Defaults |`keycloak_quarkus_ha_enabled`| Enable auto configuration for database backend, clustering and remote caches on infinispan | `False` | |`keycloak_quarkus_ha_discovery`| Discovery protocol for HA cluster members | `JDBCPING` | |`keycloak_quarkus_db_enabled`| Enable auto configuration for database backend | `True` if `keycloak_quarkus_ha_enabled` is True, else `False` | -|`keycloak_quarkus_jgroups_ip`| Host jgroups IP. If changing this variable you must make sure it is always set for all hosts in your cluster. | `{{ ansible_default_ipv4.address }}` | +|`keycloak_quarkus_jgroups_ip`| Host jgroups IP. If changing this variable you must make sure it is always set for all hosts in your cluster. | `{{ ansible_facts['default_ipv4']['address'] }}` | |`keycloak_quarkus_jgroups_port`| jgroups cluster tcp port | `7800` | |`keycloak_quarkus_systemd_wait_for_port` | Whether systemd unit should wait for keycloak port before returning | `{{ keycloak_quarkus_ha_enabled }}` | |`keycloak_quarkus_systemd_wait_for_port_number`| Which port the systemd unit should wait for | `{{ keycloak_quarkus_https_port }}` | diff --git a/roles/keycloak_quarkus/defaults/main.yml b/roles/keycloak_quarkus/defaults/main.yml index fc6bfdc..3130d4a 100644 --- a/roles/keycloak_quarkus/defaults/main.yml +++ b/roles/keycloak_quarkus/defaults/main.yml @@ -43,7 +43,7 @@ keycloak_quarkus_http_port: 8080 keycloak_quarkus_https_port: 8443 keycloak_quarkus_http_management_port: 9000 keycloak_quarkus_jgroups_port: 7800 -keycloak_quarkus_jgroups_bind_address: "{{ ansible_default_ipv4.address }}" +keycloak_quarkus_jgroups_bind_address: "{{ ansible_facts['default_ipv4']['address'] }}" keycloak_quarkus_jgroups_external_addr: "{{ keycloak_quarkus_jgroups_bind_address }}" keycloak_quarkus_jgroups_external_port: "{{ keycloak_quarkus_jgroups_port }}" keycloak_quarkus_java_heap_opts: "-Xms1024m -Xmx2048m" diff --git a/roles/keycloak_quarkus/meta/argument_specs.yml b/roles/keycloak_quarkus/meta/argument_specs.yml index 25f3e05..4b27f04 100644 --- a/roles/keycloak_quarkus/meta/argument_specs.yml +++ b/roles/keycloak_quarkus/meta/argument_specs.yml @@ -206,7 +206,7 @@ argument_specs: type: "int" keycloak_quarkus_jgroups_bind_address: description: 'jgroups bind address' - default: "{{ ansible_default_ipv4.address }}" + default: "{{ ansible_facts['default_ipv4']['address'] }}" type: "str" keycloak_quarkus_jgroups_external_addr: description: 'IP address that other instances in the Keycloak should use to contact this node' diff --git a/roles/keycloak_quarkus/tasks/main.yml b/roles/keycloak_quarkus/tasks/main.yml index 0c769e9..8292019 100644 --- a/roles/keycloak_quarkus/tasks/main.yml +++ b/roles/keycloak_quarkus/tasks/main.yml @@ -21,7 +21,7 @@ - name: Distro specific tasks ansible.builtin.include_tasks: - file: "{{ ansible_os_family | lower }}.yml" + file: "{{ ansible_facts['os_family'] | lower }}.yml" apply: tags: - unbound diff --git a/roles/keycloak_quarkus/tasks/prereqs.yml b/roles/keycloak_quarkus/tasks/prereqs.yml index 43c519c..1fcd48d 100644 --- a/roles/keycloak_quarkus/tasks/prereqs.yml +++ b/roles/keycloak_quarkus/tasks/prereqs.yml @@ -39,13 +39,13 @@ - name: Validate OS family ansible.builtin.assert: that: - - ansible_os_family in ["RedHat", "Debian"] + - ansible_facts['os_family'] in ["RedHat", "Debian"] quiet: true - fail_msg: "Can only install on RedHat or Debian OS families; found {{ ansible_os_family }}" - success_msg: "Installing on {{ ansible_os_family }}" + fail_msg: "Can only install on RedHat or Debian OS families; found {{ ansible_facts['os_family'] }}" + success_msg: "Installing on {{ ansible_facts['os_family'] }}" - name: Load OS specific variables - ansible.builtin.include_vars: "vars/{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "vars/{{ ansible_facts['os_family'] | lower }}.yml" tags: - always