diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a622526..de65d72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,23 +6,14 @@ on: - main pull_request: workflow_dispatch: - inputs: - debug_verbosity: - description: 'ANSIBLE_VERBOSITY envvar value' - required: false schedule: - cron: '15 6 * * *' jobs: ci: - uses: ansible-middleware/github-actions/.github/workflows/cish.yml@main + uses: ansible-middleware/github-actions/.github/workflows/ci.yml@main secrets: inherit with: fqcn: 'middleware_automation/keycloak' - debug_verbosity: "${{ github.event.inputs.debug_verbosity }}" molecule_tests: >- - [ "debian", "quarkus", "quarkus_ha", "quarkus_ha_remote" ] - podman_tests_current: >- - [ "default", "quarkus_devmode", "quarkus_upgrade" ] - podman_tests_next: >- - [ "default", "quarkus_devmode", "quarkus_upgrade" ] + [ "default", "overridexml", "https_revproxy", "quarkus", "quarkus-devmode", "quarkus_upgrade", "debian", "quarkus_ha" ] diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 981d6e7..d6b2d25 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,39 +6,6 @@ middleware\_automation.keycloak Release Notes This changelog describes changes after version 0.2.6. -v3.0.2 -====== - -Minor Changes -------------- - -- New ``checksum`` property for keycloak_quarkus_providers `#280 `_ -- New parameter to set the jgroups host IP address `#281 `_ -- Session storage / distributed caches `#287 `_ -- Update keycloak/RHBK to v26.2.4 `#283 `_ - -Bugfixes --------- - -- Fix ``keycloak_quarkus_force_install`` parameter being ignored by install `#296 `_ -- Fix alternate download location being ignored (JBossNeworkAPI always used) `#298 `_ -- Run config rebuild after SPI providers update `#285 `_ -- Use jdk21 as default in debian `#289 `_ -- keycloak_realm: federation default provider type should be a string `#302 `_ - -v3.0.1 -====== - -Minor Changes -------------- - -- Version update to 26.0.8 / rhbk 26.0.11 `#277 `_ - -Bugfixes --------- - -- Trigger rebuild handler on envvars file change `#276 `_ - v3.0.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 6fbf0ab..3d25cd2 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -660,62 +660,3 @@ releases: name: keycloak_realm namespace: '' release_date: '2025-04-23' - 3.0.1: - changes: - bugfixes: - - 'Trigger rebuild handler on envvars file change `#276 `_ - - ' - minor_changes: - - 'Version update to 26.0.8 / rhbk 26.0.11 `#277 `_ - - ' - fragments: - - 276.yaml - - 277.yaml - release_date: '2025-05-02' - 3.0.2: - changes: - bugfixes: - - 'Fix ``keycloak_quarkus_force_install`` parameter being ignored by install - `#296 `_ - - ' - - 'Fix alternate download location being ignored (JBossNeworkAPI always used) - `#298 `_ - - ' - - 'Run config rebuild after SPI providers update `#285 `_ - - ' - - 'Use jdk21 as default in debian `#289 `_ - - ' - - 'keycloak_realm: federation default provider type should be a string `#302 - `_ - - ' - minor_changes: - - 'New ``checksum`` property for keycloak_quarkus_providers `#280 `_ - - ' - - 'New parameter to set the jgroups host IP address `#281 `_ - - ' - - 'Session storage / distributed caches `#287 `_ - - ' - - 'Update keycloak/RHBK to v26.2.4 `#283 `_ - - ' - fragments: - - 280.yaml - - 281.yaml - - 283.yaml - - 285.yaml - - 287.yaml - - 289.yaml - - 296.yaml - - 298.yaml - - 302.yaml - release_date: '2025-07-01' diff --git a/galaxy.yml b/galaxy.yml index 70fb7b1..76c46c4 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,7 +1,7 @@ --- namespace: middleware_automation name: keycloak -version: "3.0.3" +version: "3.0.0" readme: README.md authors: - Romain Pelisse diff --git a/molecule/debian/molecule.yml b/molecule/debian/molecule.yml index 8cccc25..afe29c5 100644 --- a/molecule/debian/molecule.yml +++ b/molecule/debian/molecule.yml @@ -3,7 +3,7 @@ driver: name: docker platforms: - name: instance - image: ghcr.io/hspaans/molecule-containers:debian-13 + image: ghcr.io/hspaans/molecule-containers:debian-11 pre_build_image: true privileged: true port_bindings: diff --git a/molecule/debian/prepare.yml b/molecule/debian/prepare.yml index 7cab507..267386e 100644 --- a/molecule/debian/prepare.yml +++ b/molecule/debian/prepare.yml @@ -7,5 +7,6 @@ ansible.builtin.apt: name: - sudo - - openjdk-21-jdk-headless - - iproute2 + # - openjdk-21-jdk-headless # this is not available in ghcr.io/hspaans/molecule-containers:debian-11 (neither in debian-12) since the images are using outdated package sources + - openjdk-17-jdk-headless + state: present diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index e617b59..de97748 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -13,7 +13,6 @@ keycloak_quarkus_proxy_mode: none keycloak_quarkus_offline_install: true keycloak_quarkus_download_path: /tmp/keycloak/ - keycloak_quarkus_java_heap_opts: "-Xms640m -Xmx640m " roles: - role: keycloak_quarkus - role: keycloak_realm diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 587a3c8..011c08e 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -1,6 +1,6 @@ --- driver: - name: podman + name: docker platforms: - name: instance image: registry.access.redhat.com/ubi9/ubi-init:latest @@ -29,8 +29,6 @@ provisioner: ansible_python_interpreter: "{{ ansible_playbook_python }}" env: ANSIBLE_FORCE_COLOR: "true" - PROXY: "${PROXY}" - NO_PROXY: "${NO_PROXY}" verifier: name: ansible scenario: diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index 540e321..eefd5cf 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -7,6 +7,10 @@ tasks: - name: "Run preparation common to all scenario" ansible.builtin.include_tasks: ../prepare.yml + vars: + assets: + - "{{ assets_server }}/sso/7.6.0/rh-sso-7.6.0-server-dist.zip" + - "{{ assets_server }}/sso/7.6.1/rh-sso-7.6.1-patch.zip" - name: Create controller directory for downloads ansible.builtin.file: # noqa risky-file-permissions delegated, uses controller host user @@ -18,7 +22,7 @@ - name: Download keycloak archive to controller directory ansible.builtin.get_url: # noqa risky-file-permissions delegated, uses controller host user - url: https://github.com/keycloak/keycloak/releases/download/26.3.0/keycloak-26.3.0.zip + url: https://github.com/keycloak/keycloak/releases/download/26.0.7/keycloak-26.0.7.zip dest: /tmp/keycloak mode: '0640' delegate_to: localhost diff --git a/molecule/quarkus_devmode/converge.yml b/molecule/quarkus-devmode/converge.yml similarity index 96% rename from molecule/quarkus_devmode/converge.yml rename to molecule/quarkus-devmode/converge.yml index a596478..6c0b14f 100644 --- a/molecule/quarkus_devmode/converge.yml +++ b/molecule/quarkus-devmode/converge.yml @@ -11,8 +11,6 @@ keycloak_quarkus_start_dev: True keycloak_quarkus_proxy_mode: none keycloak_quarkus_java_home: /opt/openjdk/ - keycloak_quarkus_java_heap_opts: "-Xms640m -Xmx640m" - roles: - role: keycloak_quarkus - role: keycloak_realm diff --git a/molecule/quarkus_devmode/molecule.yml b/molecule/quarkus-devmode/molecule.yml similarity index 93% rename from molecule/quarkus_devmode/molecule.yml rename to molecule/quarkus-devmode/molecule.yml index 0ae28b3..2da7e01 100644 --- a/molecule/quarkus_devmode/molecule.yml +++ b/molecule/quarkus-devmode/molecule.yml @@ -1,6 +1,6 @@ --- driver: - name: podman + name: docker platforms: - name: instance image: registry.access.redhat.com/ubi9/ubi-init:latest @@ -31,8 +31,6 @@ provisioner: ansible_python_interpreter: "{{ ansible_playbook_python }}" env: ANSIBLE_FORCE_COLOR: "true" - PROXY: "${PROXY}" - NO_PROXY: "${NO_PROXY}" verifier: name: ansible scenario: diff --git a/molecule/quarkus_devmode/prepare.yml b/molecule/quarkus-devmode/prepare.yml similarity index 100% rename from molecule/quarkus_devmode/prepare.yml rename to molecule/quarkus-devmode/prepare.yml diff --git a/molecule/quarkus_devmode/roles b/molecule/quarkus-devmode/roles similarity index 100% rename from molecule/quarkus_devmode/roles rename to molecule/quarkus-devmode/roles diff --git a/molecule/quarkus_devmode/verify.yml b/molecule/quarkus-devmode/verify.yml similarity index 100% rename from molecule/quarkus_devmode/verify.yml rename to molecule/quarkus-devmode/verify.yml diff --git a/molecule/quarkus/converge.yml b/molecule/quarkus/converge.yml index 857c072..cb3b9f8 100644 --- a/molecule/quarkus/converge.yml +++ b/molecule/quarkus/converge.yml @@ -23,8 +23,6 @@ keycloak_quarkus_systemd_wait_for_delay: 2 keycloak_quarkus_systemd_wait_for_log: true keycloak_quarkus_restart_health_check: false # would fail because of self-signed cert - keycloak_quarkus_version: 26.3.0 - keycloak_quarkus_java_heap_opts: "-Xms1024m -Xmx1024m" keycloak_quarkus_additional_env_vars: - key: KC_FEATURES_DISABLED value: impersonation,kerberos @@ -38,24 +36,21 @@ value: 10 - id: spid-saml url: https://github.com/italia/spid-keycloak-provider/releases/download/24.0.2/spid-provider.jar - - id: spid-saml-w-checksum - url: https://github.com/italia/spid-keycloak-provider/releases/download/24.0.2/spid-provider.jar - checksum: sha256:fbb50e73739d7a6d35b5bff611b1c01668b29adf6f6259624b95e466a305f377 - id: keycloak-kerberos-federation maven: repository_url: https://repo1.maven.org/maven2/ # https://mvnrepository.com/artifact/org.keycloak/keycloak-kerberos-federation/24.0.4 group_id: org.keycloak artifact_id: keycloak-kerberos-federation - version: 26.3.0 # optional + version: 26.0.7 # optional # username: myUser # optional # password: myPAT # optional # - id: my-static-theme # local_path: /tmp/my-static-theme.jar keycloak_quarkus_policies: - - name: "cain-and-abel.txt" - url: "https://github.com/danielmiessler/SecLists/raw/master/Passwords/Software/cain-and-abel.txt" - - name: "john-the-ripper.txt" - url: "https://github.com/danielmiessler/SecLists/raw/master/Passwords/Software/john-the-ripper.txt" + - name: "xato-net-10-million-passwords.txt" + url: "https://github.com/danielmiessler/SecLists/raw/master/Passwords/xato-net-10-million-passwords.txt" + - name: "xato-net-10-million-passwords-10.txt" + url: "https://github.com/danielmiessler/SecLists/raw/master/Passwords/xato-net-10-million-passwords-10.txt" type: password-blacklists roles: - role: keycloak_quarkus diff --git a/molecule/quarkus/molecule.yml b/molecule/quarkus/molecule.yml index 20ca3bc..cf975e5 100644 --- a/molecule/quarkus/molecule.yml +++ b/molecule/quarkus/molecule.yml @@ -32,8 +32,6 @@ provisioner: env: ANSIBLE_FORCE_COLOR: "true" PYTHONHTTPSVERIFY: 0 - PROXY: "${PROXY}" - NO_PROXY: "${NO_PROXY}" verifier: name: ansible scenario: diff --git a/molecule/quarkus/prepare.yml b/molecule/quarkus/prepare.yml index abe2518..d8ef369 100644 --- a/molecule/quarkus/prepare.yml +++ b/molecule/quarkus/prepare.yml @@ -24,7 +24,7 @@ - name: Make sure a jre is available (for keytool to prepare keystore) delegate_to: localhost ansible.builtin.package: - name: java-21-openjdk-headless + name: "{{ 'java-21-openjdk-headless' if hera_home | length > 0 else 'openjdk-21-jdk-headless' }}" state: present become: true failed_when: false diff --git a/molecule/quarkus_ha_remote/converge.yml b/molecule/quarkus_ha_remote/converge.yml deleted file mode 100644 index e62ae23..0000000 --- a/molecule/quarkus_ha_remote/converge.yml +++ /dev/null @@ -1,57 +0,0 @@ ---- -- name: Converge - hosts: infinispan - roles: - - role: middleware_automation.infinispan.infinispan - infinispan_service_name: infinispan - infinispan_supervisor_password: remembertochangeme - infinispan_keycloak_caches: true - infinispan_keycloak_persistence: False - infinispan_jdbc_engine: postgres - infinispan_jdbc_url: jdbc:postgresql://postgres:5432/keycloak - infinispan_jdbc_driver_version: 9.4.1212 - infinispan_jdbc_user: keycloak - infinispan_jdbc_pass: mysecretpass - infinispan_bind_address: "{{ ansible_default_ipv4.address }}" - infinispan_users: - - { name: 'testuser', password: 'test', roles: 'observer' } - -- name: Converge - hosts: keycloak - vars: - keycloak_quarkus_show_deprecation_warnings: false - keycloak_quarkus_bootstrap_admin_password: "remembertochangeme" - keycloak_quarkus_bootstrap_admin_user: "remembertochangeme" - keycloak_quarkus_hostname: "http://{{ inventory_hostname }}:8080" - keycloak_quarkus_log: file - keycloak_quarkus_log_level: info - keycloak_quarkus_https_key_file_enabled: true - keycloak_quarkus_key_file_copy_enabled: true - keycloak_quarkus_key_content: "{{ lookup('file', inventory_hostname + '.key') }}" - keycloak_quarkus_cert_file_copy_enabled: true - keycloak_quarkus_cert_file_src: "{{ inventory_hostname }}.pem" - keycloak_quarkus_ks_vault_enabled: true - keycloak_quarkus_ks_vault_file: "/opt/keycloak/vault/keystore.p12" - keycloak_quarkus_ks_vault_pass: keystorepassword - keycloak_quarkus_systemd_wait_for_port: true - keycloak_quarkus_systemd_wait_for_timeout: 20 - keycloak_quarkus_systemd_wait_for_delay: 2 - keycloak_quarkus_systemd_wait_for_log: true - keycloak_quarkus_ha_enabled: true - keycloak_quarkus_restart_strategy: restart/serial.yml - keycloak_quarkus_db_user: keycloak - keycloak_quarkus_db_pass: mysecretpass - keycloak_quarkus_db_url: jdbc:postgresql://postgres:5432/keycloak - keycloak_quarkus_cache_remote: true - keycloak_quarkus_cache_remote_username: supervisor - keycloak_quarkus_cache_remote_password: remembertochangeme - keycloak_quarkus_cache_remote_host: "infinispan1" - keycloak_quarkus_cache_remote_port: 11222 - keycloak_quarkus_cache_remote_tls_enabled: false - keycloak_quarkus_additional_env_vars: - - key: KC_FEATURES - value: clusterless - - key: KC_FEATURES_DISABLED - value: persistent-user-sessions - roles: - - role: keycloak_quarkus diff --git a/molecule/quarkus_ha_remote/molecule.yml b/molecule/quarkus_ha_remote/molecule.yml deleted file mode 100644 index 23d8db6..0000000 --- a/molecule/quarkus_ha_remote/molecule.yml +++ /dev/null @@ -1,80 +0,0 @@ ---- -driver: - name: docker -platforms: - - name: keycloak1 - image: registry.access.redhat.com/ubi9/ubi-init:latest - pre_build_image: true - privileged: true - command: "/usr/sbin/init" - groups: - - keycloak - networks: - - name: rhbk - port_bindings: - - "8080/tcp" - - "8443/tcp" - - "9000/tcp" - - name: infinispan1 - image: registry.access.redhat.com/ubi9/ubi-init:latest - pre_build_image: true - privileged: true - command: "/usr/sbin/init" - groups: - - infinispan - networks: - - name: rhbk - port_bindings: - - "11222/tcp" - - name: postgres - image: ubuntu/postgres:14-22.04_beta - pre_build_image: true - privileged: true - command: postgres - groups: - - database - networks: - - name: rhbk - port_bindings: - - "5432/tcp" - mounts: - - type: bind - target: /etc/postgresql/postgresql.conf - source: ${PWD}/molecule/quarkus_ha/postgresql/postgresql.conf - env: - POSTGRES_USER: keycloak - POSTGRES_PASSWORD: mysecretpass - POSTGRES_DB: keycloak - POSTGRES_HOST_AUTH_METHOD: trust -provisioner: - name: ansible - config_options: - defaults: - interpreter_python: auto_silent - ssh_connection: - pipelining: false - playbooks: - prepare: prepare.yml - converge: converge.yml - verify: verify.yml - inventory: - host_vars: - localhost: - ansible_python_interpreter: "{{ ansible_playbook_python }}" - env: - ANSIBLE_FORCE_COLOR: "true" - PYTHONHTTPSVERIFY: 0 -verifier: - name: ansible -scenario: - test_sequence: - - cleanup - - destroy - - create - - prepare - - converge - - idempotence - - side_effect - - verify - - cleanup - - destroy diff --git a/molecule/quarkus_ha_remote/postgresql/postgresql.conf b/molecule/quarkus_ha_remote/postgresql/postgresql.conf deleted file mode 100644 index d702576..0000000 --- a/molecule/quarkus_ha_remote/postgresql/postgresql.conf +++ /dev/null @@ -1,750 +0,0 @@ -# ----------------------------- -# PostgreSQL configuration file -# ----------------------------- -# -# This file consists of lines of the form: -# -# name = value -# -# (The "=" is optional.) Whitespace may be used. Comments are introduced with -# "#" anywhere on a line. The complete list of parameter names and allowed -# values can be found in the PostgreSQL documentation. -# -# The commented-out settings shown in this file represent the default values. -# Re-commenting a setting is NOT sufficient to revert it to the default value; -# you need to reload the server. -# -# This file is read on server startup and when the server receives a SIGHUP -# signal. If you edit the file on a running system, you have to SIGHUP the -# server for the changes to take effect, run "pg_ctl reload", or execute -# "SELECT pg_reload_conf()". Some parameters, which are marked below, -# require a server shutdown and restart to take effect. -# -# Any parameter can also be given as a command-line option to the server, e.g., -# "postgres -c log_connections=on". Some parameters can be changed at run time -# with the "SET" SQL command. -# -# Memory units: kB = kilobytes Time units: ms = milliseconds -# MB = megabytes s = seconds -# GB = gigabytes min = minutes -# TB = terabytes h = hours -# d = days - - -#------------------------------------------------------------------------------ -# FILE LOCATIONS -#------------------------------------------------------------------------------ - -# The default values of these variables are driven from the -D command-line -# option or PGDATA environment variable, represented here as ConfigDir. - -#data_directory = 'ConfigDir' # use data in another directory - # (change requires restart) -#hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file - # (change requires restart) -#ident_file = 'ConfigDir/pg_ident.conf' # ident configuration file - # (change requires restart) - -# If external_pid_file is not explicitly set, no extra PID file is written. -#external_pid_file = '' # write an extra PID file - # (change requires restart) - - -#------------------------------------------------------------------------------ -# CONNECTIONS AND AUTHENTICATION -#------------------------------------------------------------------------------ - -# - Connection Settings - - -listen_addresses = '*' # what IP address(es) to listen on; - # comma-separated list of addresses; - # defaults to 'localhost'; use '*' for all - # (change requires restart) -#port = 5432 # (change requires restart) -#max_connections = 100 # (change requires restart) -#superuser_reserved_connections = 3 # (change requires restart) -#unix_socket_directories = '/tmp' # comma-separated list of directories - # (change requires restart) -#unix_socket_group = '' # (change requires restart) -#unix_socket_permissions = 0777 # begin with 0 to use octal notation - # (change requires restart) -#bonjour = off # advertise server via Bonjour - # (change requires restart) -#bonjour_name = '' # defaults to the computer name - # (change requires restart) - -# - TCP settings - -# see "man 7 tcp" for details - -#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds; - # 0 selects the system default -#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds; - # 0 selects the system default -#tcp_keepalives_count = 0 # TCP_KEEPCNT; - # 0 selects the system default -#tcp_user_timeout = 0 # TCP_USER_TIMEOUT, in milliseconds; - # 0 selects the system default - -# - Authentication - - -#authentication_timeout = 1min # 1s-600s -#password_encryption = md5 # md5 or scram-sha-256 -#db_user_namespace = off - -# GSSAPI using Kerberos -#krb_server_keyfile = '' -#krb_caseins_users = off - -# - SSL - - -#ssl = off -#ssl_ca_file = '' -#ssl_cert_file = 'server.crt' -#ssl_crl_file = '' -#ssl_key_file = 'server.key' -#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers -#ssl_prefer_server_ciphers = on -#ssl_ecdh_curve = 'prime256v1' -#ssl_min_protocol_version = 'TLSv1' -#ssl_max_protocol_version = '' -#ssl_dh_params_file = '' -#ssl_passphrase_command = '' -#ssl_passphrase_command_supports_reload = off - - -#------------------------------------------------------------------------------ -# RESOURCE USAGE (except WAL) -#------------------------------------------------------------------------------ - -# - Memory - - -#shared_buffers = 32MB # min 128kB - # (change requires restart) -#huge_pages = try # on, off, or try - # (change requires restart) -#temp_buffers = 8MB # min 800kB -#max_prepared_transactions = 0 # zero disables the feature - # (change requires restart) -# Caution: it is not advisable to set max_prepared_transactions nonzero unless -# you actively intend to use prepared transactions. -#work_mem = 4MB # min 64kB -#maintenance_work_mem = 64MB # min 1MB -#autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem -#max_stack_depth = 2MB # min 100kB -#shared_memory_type = mmap # the default is the first option - # supported by the operating system: - # mmap - # sysv - # windows - # (change requires restart) -#dynamic_shared_memory_type = posix # the default is the first option - # supported by the operating system: - # posix - # sysv - # windows - # mmap - # (change requires restart) - -# - Disk - - -#temp_file_limit = -1 # limits per-process temp file space - # in kB, or -1 for no limit - -# - Kernel Resources - - -#max_files_per_process = 1000 # min 25 - # (change requires restart) - -# - Cost-Based Vacuum Delay - - -#vacuum_cost_delay = 0 # 0-100 milliseconds (0 disables) -#vacuum_cost_page_hit = 1 # 0-10000 credits -#vacuum_cost_page_miss = 10 # 0-10000 credits -#vacuum_cost_page_dirty = 20 # 0-10000 credits -#vacuum_cost_limit = 200 # 1-10000 credits - -# - Background Writer - - -#bgwriter_delay = 200ms # 10-10000ms between rounds -#bgwriter_lru_maxpages = 100 # max buffers written/round, 0 disables -#bgwriter_lru_multiplier = 2.0 # 0-10.0 multiplier on buffers scanned/round -#bgwriter_flush_after = 0 # measured in pages, 0 disables - -# - Asynchronous Behavior - - -#effective_io_concurrency = 1 # 1-1000; 0 disables prefetching -#max_worker_processes = 8 # (change requires restart) -#max_parallel_maintenance_workers = 2 # taken from max_parallel_workers -#max_parallel_workers_per_gather = 2 # taken from max_parallel_workers -#parallel_leader_participation = on -#max_parallel_workers = 8 # maximum number of max_worker_processes that - # can be used in parallel operations -#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate - # (change requires restart) -#backend_flush_after = 0 # measured in pages, 0 disables - - -#------------------------------------------------------------------------------ -# WRITE-AHEAD LOG -#------------------------------------------------------------------------------ - -# - Settings - - -#wal_level = replica # minimal, replica, or logical - # (change requires restart) -#fsync = on # flush data to disk for crash safety - # (turning this off can cause - # unrecoverable data corruption) -#synchronous_commit = on # synchronization level; - # off, local, remote_write, remote_apply, or on -#wal_sync_method = fsync # the default is the first option - # supported by the operating system: - # open_datasync - # fdatasync (default on Linux) - # fsync - # fsync_writethrough - # open_sync -#full_page_writes = on # recover from partial page writes -#wal_compression = off # enable compression of full-page writes -#wal_log_hints = off # also do full page writes of non-critical updates - # (change requires restart) -#wal_init_zero = on # zero-fill new WAL files -#wal_recycle = on # recycle WAL files -#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers - # (change requires restart) -#wal_writer_delay = 200ms # 1-10000 milliseconds -#wal_writer_flush_after = 1MB # measured in pages, 0 disables - -#commit_delay = 0 # range 0-100000, in microseconds -#commit_siblings = 5 # range 1-1000 - -# - Checkpoints - - -#checkpoint_timeout = 5min # range 30s-1d -#max_wal_size = 1GB -#min_wal_size = 80MB -#checkpoint_completion_target = 0.5 # checkpoint target duration, 0.0 - 1.0 -#checkpoint_flush_after = 0 # measured in pages, 0 disables -#checkpoint_warning = 30s # 0 disables - -# - Archiving - - -#archive_mode = off # enables archiving; off, on, or always - # (change requires restart) -#archive_command = '' # command to use to archive a logfile segment - # placeholders: %p = path of file to archive - # %f = file name only - # e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f' -#archive_timeout = 0 # force a logfile segment switch after this - # number of seconds; 0 disables - -# - Archive Recovery - - -# These are only used in recovery mode. - -#restore_command = '' # command to use to restore an archived logfile segment - # placeholders: %p = path of file to restore - # %f = file name only - # e.g. 'cp /mnt/server/archivedir/%f %p' - # (change requires restart) -#archive_cleanup_command = '' # command to execute at every restartpoint -#recovery_end_command = '' # command to execute at completion of recovery - -# - Recovery Target - - -# Set these only when performing a targeted recovery. - -#recovery_target = '' # 'immediate' to end recovery as soon as a - # consistent state is reached - # (change requires restart) -#recovery_target_name = '' # the named restore point to which recovery will proceed - # (change requires restart) -#recovery_target_time = '' # the time stamp up to which recovery will proceed - # (change requires restart) -#recovery_target_xid = '' # the transaction ID up to which recovery will proceed - # (change requires restart) -#recovery_target_lsn = '' # the WAL LSN up to which recovery will proceed - # (change requires restart) -#recovery_target_inclusive = on # Specifies whether to stop: - # just after the specified recovery target (on) - # just before the recovery target (off) - # (change requires restart) -#recovery_target_timeline = 'latest' # 'current', 'latest', or timeline ID - # (change requires restart) -#recovery_target_action = 'pause' # 'pause', 'promote', 'shutdown' - # (change requires restart) - - -#------------------------------------------------------------------------------ -# REPLICATION -#------------------------------------------------------------------------------ - -# - Sending Servers - - -# Set these on the master and on any standby that will send replication data. - -#max_wal_senders = 10 # max number of walsender processes - # (change requires restart) -#wal_keep_segments = 0 # in logfile segments; 0 disables -#wal_sender_timeout = 60s # in milliseconds; 0 disables - -#max_replication_slots = 10 # max number of replication slots - # (change requires restart) -#track_commit_timestamp = off # collect timestamp of transaction commit - # (change requires restart) - -# - Master Server - - -# These settings are ignored on a standby server. - -#synchronous_standby_names = '' # standby servers that provide sync rep - # method to choose sync standbys, number of sync standbys, - # and comma-separated list of application_name - # from standby(s); '*' = all -#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed - -# - Standby Servers - - -# These settings are ignored on a master server. - -#primary_conninfo = '' # connection string to sending server - # (change requires restart) -#primary_slot_name = '' # replication slot on sending server - # (change requires restart) -#promote_trigger_file = '' # file name whose presence ends recovery -#hot_standby = on # "off" disallows queries during recovery - # (change requires restart) -#max_standby_archive_delay = 30s # max delay before canceling queries - # when reading WAL from archive; - # -1 allows indefinite delay -#max_standby_streaming_delay = 30s # max delay before canceling queries - # when reading streaming WAL; - # -1 allows indefinite delay -#wal_receiver_status_interval = 10s # send replies at least this often - # 0 disables -#hot_standby_feedback = off # send info from standby to prevent - # query conflicts -#wal_receiver_timeout = 60s # time that receiver waits for - # communication from master - # in milliseconds; 0 disables -#wal_retrieve_retry_interval = 5s # time to wait before retrying to - # retrieve WAL after a failed attempt -#recovery_min_apply_delay = 0 # minimum delay for applying changes during recovery - -# - Subscribers - - -# These settings are ignored on a publisher. - -#max_logical_replication_workers = 4 # taken from max_worker_processes - # (change requires restart) -#max_sync_workers_per_subscription = 2 # taken from max_logical_replication_workers - - -#------------------------------------------------------------------------------ -# QUERY TUNING -#------------------------------------------------------------------------------ - -# - Planner Method Configuration - - -#enable_bitmapscan = on -#enable_hashagg = on -#enable_hashjoin = on -#enable_indexscan = on -#enable_indexonlyscan = on -#enable_material = on -#enable_mergejoin = on -#enable_nestloop = on -#enable_parallel_append = on -#enable_seqscan = on -#enable_sort = on -#enable_tidscan = on -#enable_partitionwise_join = off -#enable_partitionwise_aggregate = off -#enable_parallel_hash = on -#enable_partition_pruning = on - -# - Planner Cost Constants - - -#seq_page_cost = 1.0 # measured on an arbitrary scale -#random_page_cost = 4.0 # same scale as above -#cpu_tuple_cost = 0.01 # same scale as above -#cpu_index_tuple_cost = 0.005 # same scale as above -#cpu_operator_cost = 0.0025 # same scale as above -#parallel_tuple_cost = 0.1 # same scale as above -#parallel_setup_cost = 1000.0 # same scale as above - -#jit_above_cost = 100000 # perform JIT compilation if available - # and query more expensive than this; - # -1 disables -#jit_inline_above_cost = 500000 # inline small functions if query is - # more expensive than this; -1 disables -#jit_optimize_above_cost = 500000 # use expensive JIT optimizations if - # query is more expensive than this; - # -1 disables - -#min_parallel_table_scan_size = 8MB -#min_parallel_index_scan_size = 512kB -#effective_cache_size = 4GB - -# - Genetic Query Optimizer - - -#geqo = on -#geqo_threshold = 12 -#geqo_effort = 5 # range 1-10 -#geqo_pool_size = 0 # selects default based on effort -#geqo_generations = 0 # selects default based on effort -#geqo_selection_bias = 2.0 # range 1.5-2.0 -#geqo_seed = 0.0 # range 0.0-1.0 - -# - Other Planner Options - - -#default_statistics_target = 100 # range 1-10000 -#constraint_exclusion = partition # on, off, or partition -#cursor_tuple_fraction = 0.1 # range 0.0-1.0 -#from_collapse_limit = 8 -#join_collapse_limit = 8 # 1 disables collapsing of explicit - # JOIN clauses -#force_parallel_mode = off -#jit = on # allow JIT compilation -#plan_cache_mode = auto # auto, force_generic_plan or - # force_custom_plan - - -#------------------------------------------------------------------------------ -# REPORTING AND LOGGING -#------------------------------------------------------------------------------ - -# - Where to Log - - -#log_destination = 'stderr' # Valid values are combinations of - # stderr, csvlog, syslog, and eventlog, - # depending on platform. csvlog - # requires logging_collector to be on. - -# This is used when logging to stderr: -#logging_collector = off # Enable capturing of stderr and csvlog - # into log files. Required to be on for - # csvlogs. - # (change requires restart) - -# These are only used if logging_collector is on: -#log_directory = 'log' # directory where log files are written, - # can be absolute or relative to PGDATA -#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern, - # can include strftime() escapes -#log_file_mode = 0600 # creation mode for log files, - # begin with 0 to use octal notation -#log_truncate_on_rotation = off # If on, an existing log file with the - # same name as the new log file will be - # truncated rather than appended to. - # But such truncation only occurs on - # time-driven rotation, not on restarts - # or size-driven rotation. Default is - # off, meaning append to existing files - # in all cases. -#log_rotation_age = 1d # Automatic rotation of logfiles will - # happen after that time. 0 disables. -#log_rotation_size = 10MB # Automatic rotation of logfiles will - # happen after that much log output. - # 0 disables. - -# These are relevant when logging to syslog: -#syslog_facility = 'LOCAL0' -#syslog_ident = 'postgres' -#syslog_sequence_numbers = on -#syslog_split_messages = on - -# This is only relevant when logging to eventlog (win32): -# (change requires restart) -#event_source = 'PostgreSQL' - -# - When to Log - - -#log_min_messages = warning # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic - -#log_min_error_statement = error # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic (effectively off) - -#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, > 0 logs only - # statements running at least this number - # of milliseconds - -#log_transaction_sample_rate = 0.0 # Fraction of transactions whose statements - # are logged regardless of their duration. 1.0 logs all - # statements from all transactions, 0.0 never logs. - -# - What to Log - - -#debug_print_parse = off -#debug_print_rewritten = off -#debug_print_plan = off -#debug_pretty_print = on -#log_checkpoints = off -#log_connections = off -#log_disconnections = off -#log_duration = off -#log_error_verbosity = default # terse, default, or verbose messages -#log_hostname = off -#log_line_prefix = '%m [%p] ' # special values: - # %a = application name - # %u = user name - # %d = database name - # %r = remote host and port - # %h = remote host - # %p = process ID - # %t = timestamp without milliseconds - # %m = timestamp with milliseconds - # %n = timestamp with milliseconds (as a Unix epoch) - # %i = command tag - # %e = SQL state - # %c = session ID - # %l = session line number - # %s = session start timestamp - # %v = virtual transaction ID - # %x = transaction ID (0 if none) - # %q = stop here in non-session - # processes - # %% = '%' - # e.g. '<%u%%%d> ' -#log_lock_waits = off # log lock waits >= deadlock_timeout -#log_statement = 'none' # none, ddl, mod, all -#log_replication_commands = off -#log_temp_files = -1 # log temporary files equal or larger - # than the specified size in kilobytes; - # -1 disables, 0 logs all temp files -#log_timezone = 'GMT' - -#------------------------------------------------------------------------------ -# PROCESS TITLE -#------------------------------------------------------------------------------ - -#cluster_name = '' # added to process titles if nonempty - # (change requires restart) -#update_process_title = on - - -#------------------------------------------------------------------------------ -# STATISTICS -#------------------------------------------------------------------------------ - -# - Query and Index Statistics Collector - - -#track_activities = on -#track_counts = on -#track_io_timing = off -#track_functions = none # none, pl, all -#track_activity_query_size = 1024 # (change requires restart) -#stats_temp_directory = 'pg_stat_tmp' - - -# - Monitoring - - -#log_parser_stats = off -#log_planner_stats = off -#log_executor_stats = off -#log_statement_stats = off - - -#------------------------------------------------------------------------------ -# AUTOVACUUM -#------------------------------------------------------------------------------ - -#autovacuum = on # Enable autovacuum subprocess? 'on' - # requires track_counts to also be on. -#log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and - # their durations, > 0 logs only - # actions running at least this number - # of milliseconds. -#autovacuum_max_workers = 3 # max number of autovacuum subprocesses - # (change requires restart) -#autovacuum_naptime = 1min # time between autovacuum runs -#autovacuum_vacuum_threshold = 50 # min number of row updates before - # vacuum -#autovacuum_analyze_threshold = 50 # min number of row updates before - # analyze -#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum -#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze -#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum - # (change requires restart) -#autovacuum_multixact_freeze_max_age = 400000000 # maximum multixact age - # before forced vacuum - # (change requires restart) -#autovacuum_vacuum_cost_delay = 2ms # default vacuum cost delay for - # autovacuum, in milliseconds; - # -1 means use vacuum_cost_delay -#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for - # autovacuum, -1 means use - # vacuum_cost_limit - - -#------------------------------------------------------------------------------ -# CLIENT CONNECTION DEFAULTS -#------------------------------------------------------------------------------ - -# - Statement Behavior - - -#client_min_messages = notice # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # log - # notice - # warning - # error -#search_path = '"$user", public' # schema names -#row_security = on -#default_tablespace = '' # a tablespace name, '' uses the default -#temp_tablespaces = '' # a list of tablespace names, '' uses - # only default tablespace -#default_table_access_method = 'heap' -#check_function_bodies = on -#default_transaction_isolation = 'read committed' -#default_transaction_read_only = off -#default_transaction_deferrable = off -#session_replication_role = 'origin' -#statement_timeout = 0 # in milliseconds, 0 is disabled -#lock_timeout = 0 # in milliseconds, 0 is disabled -#idle_in_transaction_session_timeout = 0 # in milliseconds, 0 is disabled -#vacuum_freeze_min_age = 50000000 -#vacuum_freeze_table_age = 150000000 -#vacuum_multixact_freeze_min_age = 5000000 -#vacuum_multixact_freeze_table_age = 150000000 -#vacuum_cleanup_index_scale_factor = 0.1 # fraction of total number of tuples - # before index cleanup, 0 always performs - # index cleanup -#bytea_output = 'hex' # hex, escape -#xmlbinary = 'base64' -#xmloption = 'content' -#gin_fuzzy_search_limit = 0 -#gin_pending_list_limit = 4MB - -# - Locale and Formatting - - -#datestyle = 'iso, mdy' -#intervalstyle = 'postgres' -#timezone = 'GMT' -#timezone_abbreviations = 'Default' # Select the set of available time zone - # abbreviations. Currently, there are - # Default - # Australia (historical usage) - # India - # You can create your own file in - # share/timezonesets/. -#extra_float_digits = 1 # min -15, max 3; any value >0 actually - # selects precise output mode -#client_encoding = sql_ascii # actually, defaults to database - # encoding - -# These settings are initialized by initdb, but they can be changed. -#lc_messages = 'C' # locale for system error message - # strings -#lc_monetary = 'C' # locale for monetary formatting -#lc_numeric = 'C' # locale for number formatting -#lc_time = 'C' # locale for time formatting - -# default configuration for text search -#default_text_search_config = 'pg_catalog.simple' - -# - Shared Library Preloading - - -#shared_preload_libraries = '' # (change requires restart) -#local_preload_libraries = '' -#session_preload_libraries = '' -#jit_provider = 'llvmjit' # JIT library to use - -# - Other Defaults - - -#dynamic_library_path = '$libdir' - - -#------------------------------------------------------------------------------ -# LOCK MANAGEMENT -#------------------------------------------------------------------------------ - -#deadlock_timeout = 1s -#max_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_relation = -2 # negative values mean - # (max_pred_locks_per_transaction - # / -max_pred_locks_per_relation) - 1 -#max_pred_locks_per_page = 2 # min 0 - - -#------------------------------------------------------------------------------ -# VERSION AND PLATFORM COMPATIBILITY -#------------------------------------------------------------------------------ - -# - Previous PostgreSQL Versions - - -#array_nulls = on -#backslash_quote = safe_encoding # on, off, or safe_encoding -#escape_string_warning = on -#lo_compat_privileges = off -#operator_precedence_warning = off -#quote_all_identifiers = off -#standard_conforming_strings = on -#synchronize_seqscans = on - -# - Other Platforms and Clients - - -#transform_null_equals = off - - -#------------------------------------------------------------------------------ -# ERROR HANDLING -#------------------------------------------------------------------------------ - -#exit_on_error = off # terminate session on any error? -#restart_after_crash = on # reinitialize after backend crash? -#data_sync_retry = off # retry or panic on failure to fsync - # data? - # (change requires restart) - - -#------------------------------------------------------------------------------ -# CONFIG FILE INCLUDES -#------------------------------------------------------------------------------ - -# These options allow settings to be loaded from files other than the -# default postgresql.conf. Note that these are directives, not variable -# assignments, so they can usefully be given more than once. - -#include_dir = '...' # include files ending in '.conf' from - # a directory, e.g., 'conf.d' -#include_if_exists = '...' # include file only if it exists -#include = '...' # include file - - -#------------------------------------------------------------------------------ -# CUSTOMIZED OPTIONS -#------------------------------------------------------------------------------ - -# Add settings for extensions here diff --git a/molecule/quarkus_ha_remote/prepare.yml b/molecule/quarkus_ha_remote/prepare.yml deleted file mode 100644 index 16ae9b9..0000000 --- a/molecule/quarkus_ha_remote/prepare.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- name: Prepare - hosts: 'keycloak:infinispan' - tasks: - - name: "Display hera_home if defined." - ansible.builtin.set_fact: - hera_home: "{{ lookup('env', 'HERA_HOME') }}" - - - name: "Ensure common prepare phase are set." - ansible.builtin.include_tasks: ../prepare.yml - - - name: Create certificate request - ansible.builtin.command: "openssl req -x509 -newkey rsa:4096 -keyout {{ inventory_hostname }}.key -out {{ inventory_hostname }}.pem -sha256 -days 365 -nodes -subj '/CN={{ inventory_hostname }}'" - delegate_to: localhost - changed_when: False - - - name: Create vault directory - become: true - ansible.builtin.file: - state: directory - path: "/opt/keycloak/vault" - mode: 0755 - - - name: Make sure a jre is available (for keytool to prepare keystore) - delegate_to: localhost - ansible.builtin.package: - name: "{{ 'java-17-openjdk-headless' if hera_home | length > 0 else 'openjdk-17-jdk-headless' }}" - state: present - become: true - failed_when: false - - - name: Create vault keystore - ansible.builtin.command: keytool -importpass -alias TestRealm_testalias -keystore keystore.p12 -storepass keystorepassword - delegate_to: localhost - register: keytool_cmd - changed_when: False - failed_when: not 'already exists' in keytool_cmd.stdout and keytool_cmd.rc != 0 - - - name: Copy certificates and vault - become: true - ansible.builtin.copy: - src: keystore.p12 - dest: /opt/keycloak/vault/keystore.p12 - mode: 0444 diff --git a/molecule/quarkus_ha_remote/roles b/molecule/quarkus_ha_remote/roles deleted file mode 120000 index b741aa3..0000000 --- a/molecule/quarkus_ha_remote/roles +++ /dev/null @@ -1 +0,0 @@ -../../roles \ No newline at end of file diff --git a/molecule/quarkus_ha_remote/verify.yml b/molecule/quarkus_ha_remote/verify.yml deleted file mode 100644 index c1a2fb9..0000000 --- a/molecule/quarkus_ha_remote/verify.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: Verify - hosts: keycloak - tasks: - - name: Populate service facts - ansible.builtin.service_facts: - - - name: Check if keycloak service started - ansible.builtin.assert: - that: - - ansible_facts.services["keycloak.service"]["state"] == "running" - - ansible_facts.services["keycloak.service"]["status"] == "enabled" - fail_msg: "Service not running" - - - name: Set internal envvar - ansible.builtin.set_fact: - hera_home: "{{ lookup('env', 'HERA_HOME') }}" - - - name: Check log file - become: true - ansible.builtin.stat: - path: /var/log/keycloak/keycloak.log - register: keycloak_log_file - - - name: Check if keycloak file exists - ansible.builtin.assert: - that: - - keycloak_log_file.stat.exists - - not keycloak_log_file.stat.isdir diff --git a/molecule/quarkus_upgrade/converge.yml b/molecule/quarkus_upgrade/converge.yml index 0f67169..9b57436 100644 --- a/molecule/quarkus_upgrade/converge.yml +++ b/molecule/quarkus_upgrade/converge.yml @@ -5,9 +5,6 @@ - vars.yml vars: keycloak_quarkus_show_deprecation_warnings: false - keycloak_quarkus_additional_env_vars: - - key: KC_FEATURES_DISABLED - value: ciba,device-flow,impersonation,kerberos,docker keycloak_quarkus_version: 26.0.7 roles: - role: keycloak_quarkus diff --git a/molecule/quarkus_upgrade/molecule.yml b/molecule/quarkus_upgrade/molecule.yml index b121079..21782e8 100644 --- a/molecule/quarkus_upgrade/molecule.yml +++ b/molecule/quarkus_upgrade/molecule.yml @@ -4,7 +4,7 @@ dependency: options: requirements-file: molecule/requirements.yml driver: - name: podman + name: docker platforms: - name: instance image: registry.access.redhat.com/ubi9/ubi-init:latest @@ -27,10 +27,6 @@ provisioner: host_vars: localhost: ansible_python_interpreter: "{{ ansible_playbook_python }}" - env: - ANSIBLE_FORCE_COLOR: "true" - PROXY: "${PROXY}" - NO_PROXY: "${NO_PROXY}" verifier: name: ansible scenario: diff --git a/molecule/quarkus_upgrade/prepare.yml b/molecule/quarkus_upgrade/prepare.yml index 1be16d6..a6892e3 100644 --- a/molecule/quarkus_upgrade/prepare.yml +++ b/molecule/quarkus_upgrade/prepare.yml @@ -5,10 +5,7 @@ - vars.yml vars: sudo_pkg_name: sudo - keycloak_quarkus_version: 26.0.4 - keycloak_quarkus_additional_env_vars: - - key: KC_FEATURES_DISABLED - value: impersonation,kerberos + keycloak_quarkus_version: 24.0.5 pre_tasks: - name: Install sudo ansible.builtin.apt: @@ -47,7 +44,6 @@ changed_when: false roles: - role: keycloak_quarkus - post_tasks: - name: "Delete custom fact" ansible.builtin.file: diff --git a/molecule/requirements.yml b/molecule/requirements.yml index 125a922..5c8bb43 100644 --- a/molecule/requirements.yml +++ b/molecule/requirements.yml @@ -2,7 +2,6 @@ collections: - name: middleware_automation.common - name: middleware_automation.jbcs - - name: middleware_automation.infinispan - name: community.general - name: ansible.posix - name: community.docker diff --git a/roles/keycloak/tasks/debian.yml b/roles/keycloak/tasks/debian.yml index acfadcc..ffb1348 100644 --- a/roles/keycloak/tasks/debian.yml +++ b/roles/keycloak/tasks/debian.yml @@ -1,10 +1,6 @@ --- - name: Include firewall config tasks - ansible.builtin.include_tasks: - file: iptables.yml - apply: - tags: - - firewall + ansible.builtin.include_tasks: iptables.yml when: keycloak_configure_iptables tags: - firewall diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml index f826b63..a21f359 100644 --- a/roles/keycloak/tasks/main.yml +++ b/roles/keycloak/tasks/main.yml @@ -1,38 +1,22 @@ --- # tasks file for keycloak - name: Check prerequisites - ansible.builtin.include_tasks: - file: prereqs.yml - apply: - tags: - - prereqs + ansible.builtin.include_tasks: prereqs.yml tags: - prereqs - name: Distro specific tasks - ansible.builtin.include_tasks: - file: "{{ ansible_os_family | lower }}.yml" - apply: - tags: - - unbound + ansible.builtin.include_tasks: "{{ ansible_os_family | lower }}.yml" tags: - unbound - name: Include install tasks - ansible.builtin.include_tasks: - file: install.yml - apply: - tags: - - install + ansible.builtin.include_tasks: install.yml tags: - install - name: Include systemd tasks - ansible.builtin.include_tasks: - file: systemd.yml - apply: - tags: - - systemd + ansible.builtin.include_tasks: systemd.yml tags: - systemd diff --git a/roles/keycloak/tasks/redhat.yml b/roles/keycloak/tasks/redhat.yml index ece5772..596834b 100644 --- a/roles/keycloak/tasks/redhat.yml +++ b/roles/keycloak/tasks/redhat.yml @@ -1,10 +1,6 @@ --- - name: Include firewall config tasks - ansible.builtin.include_tasks: - file: firewalld.yml - apply: - tags: - - firewall + ansible.builtin.include_tasks: firewalld.yml when: keycloak_configure_firewalld tags: - firewall diff --git a/roles/keycloak_quarkus/README.md b/roles/keycloak_quarkus/README.md index 8ac353f..7f93a9f 100644 --- a/roles/keycloak_quarkus/README.md +++ b/roles/keycloak_quarkus/README.md @@ -33,7 +33,7 @@ Role Defaults | Variable | Description | Default | |:---------|:------------|:--------| -|`keycloak_quarkus_version`| keycloak.org package version | `26.3.0` | +|`keycloak_quarkus_version`| keycloak.org package version | `26.0.7` | |`keycloak_quarkus_offline_install` | Perform an offline install | `False`| |`keycloak_quarkus_dest`| Installation root path | `/opt/keycloak` | |`keycloak_quarkus_download_url` | Download URL for keycloak | `https://github.com/keycloak/keycloak/releases/download/{{ keycloak_quarkus_version }}/{{ keycloak_quarkus_archive }}` | @@ -77,9 +77,8 @@ Role Defaults | Variable | Description | Default | |:---------|:------------|:--------| |`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_ha_discovery`| Discovery protocol for HA cluster members | `TCPPING` | |`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_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 }}` | @@ -147,11 +146,9 @@ Role Defaults | Variable | Description | Default | |:---------|:------------|:--------| -|`keycloak_quarkus_cache_remote` | Whether to connect to remote cache infinispan server | `false` | |`keycloak_quarkus_cache_remote_username` | Username for connecting to infinispan | `supervisor` | |`keycloak_quarkus_cache_remote_password` | Password for connecting to infinispan | `supervisor` | -|`keycloak_quarkus_cache_remote_host` | Hostname for connecting to infinispan | `localhost` | -|`keycloak_quarkus_cache_remote_port`| Port for connecting to infinispan | `11222` | +|`keycloak_quarkus_cache_remote_host` | host name/port for connecting to infinispan, eg. host1:11222;host2:11222 | `localhost:11222` | |`keycloak_quarkus_cache_remote_sasl_mechanism` | Infinispan auth mechanism | `SCRAM-SHA-512` | |`keycloak_quarkus_cache_remote_tls_enabled` | Whether infinispan uses TLS connection | `false` | @@ -182,7 +179,7 @@ Role Defaults |`keycloak_quarkus_config_dir` | Path for configuration | `{{ keycloak_quarkus_home }}/conf` | |`keycloak_quarkus_master_realm` | Name for rest authentication realm | `master` | |`keycloak_auth_client` | Authentication client for configuration REST calls | `admin-cli` | -|`keycloak_quarkus_force_install` | Remove pre-existing versions of service | `False` | +|`keycloak_force_install` | Remove pre-existing versions of service | `False` | |`keycloak_quarkus_proxy_mode`| The proxy address forwarding mode if the server is behind a reverse proxy | `edge` | |`keycloak_quarkus_start_dev`| Whether to start the service in development mode (start-dev) | `False` | |`keycloak_quarkus_transaction_xa_enabled`| Whether to use XA transactions | `True` | @@ -221,7 +218,6 @@ keycloak_quarkus_providers: restart: true # optional, whether to rebuild config and restart the service after deploying, default true url: https://.../.../custom_spi.jar # optional, url for download via http local_path: my_theme_spi.jar # optional, path on local controller for SPI to be uploaded - remote: true # optional, whether to copy from localhost or remotely, see https://docs.ansible.com/ansible/latest/collections/ansible/builtin/copy_module.html#parameter-remote_src, default false maven: # optional, for download using maven repository_url: https://maven.pkg.github.com/OWNER/REPOSITORY # optional, maven repo url group_id: my.group # optional, maven group id @@ -232,10 +228,6 @@ keycloak_quarkus_providers: properties: # optional, list of key-values - key: default-connection-pool-size value: 10 - checksum: sha256:D98291AC[...]B6DC7B97 # optional, checksum used to verify integrity: - # for `url` SPIs, use format: :, cf. ; - # for `local_path` SPIs, use SHA1 format - # for `maven` SPIs, this field is ignored since maven has integrity verification methods enabled by default ``` the definition above will generate the following build command: @@ -255,9 +247,9 @@ Provider definition: ```yaml keycloak_quarkus_policies: - - name: john-the-ripper.txt # required, resulting file name - url: https://github.com/danielmiessler/SecLists/raw/master/Passwords/Software/john-the-ripper.txt # required, url for download - type: password-blacklists # optional, defaults to `password-blacklists`; supported values: [`password-blacklists`] + - name: xato-net-10-million-passwords.txt # required, resulting file name + url: https://github.com/danielmiessler/SecLists/raw/master/Passwords/xato-net-10-million-passwords.txt # required, url for download + type: password-blacklists # optional, defaults to `password-blacklists`; supported values: [`password-blacklists`] ``` diff --git a/roles/keycloak_quarkus/defaults/main.yml b/roles/keycloak_quarkus/defaults/main.yml index c96aa8a..7fefc5a 100644 --- a/roles/keycloak_quarkus/defaults/main.yml +++ b/roles/keycloak_quarkus/defaults/main.yml @@ -1,6 +1,6 @@ --- ### Configuration specific to keycloak -keycloak_quarkus_version: 26.3.0 +keycloak_quarkus_version: 26.0.7 keycloak_quarkus_archive: "keycloak-{{ keycloak_quarkus_version }}.zip" keycloak_quarkus_download_url: "https://github.com/keycloak/keycloak/releases/download/{{ keycloak_quarkus_version }}/{{ keycloak_quarkus_archive }}" keycloak_quarkus_installdir: "{{ keycloak_quarkus_dest }}/keycloak-{{ keycloak_quarkus_version }}" @@ -39,20 +39,12 @@ 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_external_addr: "{{ keycloak_quarkus_jgroups_bind_address }}" -keycloak_quarkus_jgroups_external_port: "{{ keycloak_quarkus_jgroups_port }}" keycloak_quarkus_java_heap_opts: "-Xms1024m -Xmx2048m" -keycloak_quarkus_java_jvm_opts: > - -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Dfile.encoding=UTF-8 -Dsun.stdout.encoding=UTF-8 +keycloak_quarkus_java_jvm_opts: "-XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Dfile.encoding=UTF-8 -Dsun.stdout.encoding=UTF-8 -Dsun.err.encoding=UTF-8 -Dstdout.encoding=UTF-8 -Dstderr.encoding=UTF-8 -XX:+ExitOnOutOfMemoryError -Djava.security.egd=file:/dev/urandom -XX:+UseParallelGC -XX:GCTimeRatio=4 - -XX:AdaptiveSizePolicyWeight=90 -XX:FlightRecorderOptions=stackdepth=512 -keycloak_quarkus_jgroups_opts: > - -Djgroups.bind.address={{ keycloak_quarkus_jgroups_bind_address }} - -Djgroups.external_port={{ keycloak_quarkus_jgroups_external_port }} - -Djgroups.external_addr={{ keycloak_quarkus_jgroups_external_addr }} -keycloak_quarkus_java_opts: "{{ ' '.join((keycloak_quarkus_jgroups_opts, keycloak_quarkus_java_heap_opts, keycloak_quarkus_java_jvm_opts)) }}" + -XX:AdaptiveSizePolicyWeight=90 -XX:FlightRecorderOptions=stackdepth=512" +keycloak_quarkus_java_opts: "{{ keycloak_quarkus_java_heap_opts + ' ' + keycloak_quarkus_java_jvm_opts }}" keycloak_quarkus_additional_env_vars: [] ### TLS/HTTPS configuration @@ -77,7 +69,7 @@ keycloak_quarkus_config_key_store_password: '' ### Enable configuration for database backend, clustering and remote caches on infinispan keycloak_quarkus_ha_enabled: false -keycloak_quarkus_ha_discovery: "JDBCPING" +keycloak_quarkus_ha_discovery: "TCPPING" ### Enable database configuration, must be enabled when HA is configured keycloak_quarkus_db_enabled: "{{ keycloak_quarkus_ha_enabled }}" keycloak_quarkus_systemd_wait_for_port: "{{ keycloak_quarkus_ha_enabled }}" @@ -117,36 +109,15 @@ keycloak_quarkus_spi_sticky_session_encoder_infinispan_should_attach_route: true keycloak_quarkus_metrics_enabled: false keycloak_quarkus_health_enabled: true -### caches; must read: https://www.keycloak.org/2024/12/storing-sessions-in-kc26 -### embedded caches -# https://www.keycloak.org/server/caching -keycloak_quarkus_cache_metrics_enabled: false -keycloak_quarkus_cache_embedded_authorization_max_count: -keycloak_quarkus_cache_embedded_client_sessions_max_count: -keycloak_quarkus_cache_embedded_crl_max_count: -keycloak_quarkus_cache_embedded_keys_max_count: -keycloak_quarkus_cache_embedded_offline_client_sessions_max_count: -keycloak_quarkus_cache_embedded_offline_sessions_max_count: -keycloak_quarkus_cache_embedded_realms_max_count: -keycloak_quarkus_cache_embedded_sessions_max_count: -keycloak_quarkus_cache_embedded_users_max_count: -keycloak_quarkus_cache_embedded_mtls_enabled: true -keycloak_quarkus_cache_embedded_mtls_key_store_file: "{{ keycloak.home }}/conf/cache_key_store.p12" -keycloak_quarkus_cache_embedded_mtls_key_store_password: '' -keycloak_quarkus_cache_embedded_mtls_rotation_interval_days: 30 -keycloak_quarkus_cache_embedded_mtls_trust_store_file: "{{ keycloak.home }}/conf/cache_trust_store.p12" -keycloak_quarkus_cache_embedded_mtls_trust_store_password: '' - ### infinispan remote caches access (hotrod) -# https://www.keycloak.org/server/caching#_remote_cache -keycloak_quarkus_cache_remote: false -keycloak_quarkus_cache_remote_username: supervisor -keycloak_quarkus_cache_remote_password: supervisor -keycloak_quarkus_cache_remote_host: localhost -keycloak_quarkus_cache_remote_port: 11222 -keycloak_quarkus_cache_remote_tls_enabled: false -keycloak_quarkus_cache_remote_sasl_mechanism: SCRAM-SHA-512 - +keycloak_quarkus_ispn_user: supervisor +keycloak_quarkus_ispn_pass: supervisor +keycloak_quarkus_ispn_hosts: "localhost:11222" +keycloak_quarkus_ispn_sasl_mechanism: SCRAM-SHA-512 +keycloak_quarkus_ispn_use_ssl: false +# if ssl is enabled, import ispn server certificate here +keycloak_quarkus_ispn_trust_store_path: /etc/pki/java/cacerts +keycloak_quarkus_ispn_trust_store_password: changeit ### database backend engine: values [ 'postgres', 'mariadb' ] keycloak_quarkus_db_engine: postgres @@ -155,19 +126,19 @@ keycloak_quarkus_db_user: keycloak-user keycloak_quarkus_db_pass: keycloak-pass keycloak_quarkus_db_url: "{{ keycloak_quarkus_default_jdbc[keycloak_quarkus_db_engine].url }}" keycloak_quarkus_db_driver_version: "{{ keycloak_quarkus_default_jdbc[keycloak_quarkus_db_engine].version }}" -# override the variables above, following defaults show recommended version as per -# https://access.redhat.com/articles/7033107 +# override the variables above, following defaults show minimum supported versions keycloak_quarkus_default_jdbc: postgres: url: 'jdbc:postgresql://localhost:5432/keycloak' - version: 42.7.5 + version: 9.4.1212 mariadb: url: 'jdbc:mariadb://localhost:3306/keycloak' - version: 3.5.2 + version: 2.7.4 mssql: url: 'jdbc:sqlserver://localhost:1433;databaseName=keycloak;' version: 12.8.1 driver_jar_url: "https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/12.8.1.jre11/mssql-jdbc-12.8.1.jre11.jar" + # cf. https://docs.redhat.com/en/documentation/red_hat_build_of_keycloak/26.0/html-single/server_configuration_guide/index#db-installing-the-microsoft-sql-server-driver ### logging configuration keycloak_quarkus_log: file keycloak_quarkus_log_level: info @@ -194,5 +165,3 @@ keycloak_quarkus_restart_health_check: true keycloak_quarkus_restart_health_check_delay: 10 keycloak_quarkus_restart_health_check_retries: 25 keycloak_quarkus_restart_pause: 15 - -keycloak_quarkus_force_install: false diff --git a/roles/keycloak_quarkus/meta/argument_specs.yml b/roles/keycloak_quarkus/meta/argument_specs.yml index 7525c50..51b0d1f 100644 --- a/roles/keycloak_quarkus/meta/argument_specs.yml +++ b/roles/keycloak_quarkus/meta/argument_specs.yml @@ -2,7 +2,7 @@ argument_specs: main: options: keycloak_quarkus_version: - default: "26.3.0" + default: "26.0.7" description: "keycloak.org package version" type: "str" keycloak_quarkus_archive: @@ -72,10 +72,6 @@ argument_specs: default: "admin" description: "Administration user account, only for bootstrapping" type: "str" - keycloak_quarkus_force_install: - default: false - description: "Remove pre-existing versions of service" - type: "bool" keycloak_quarkus_bootstrap_admin_password: required: true description: "Password of admin account, only for bootstrapping" @@ -199,6 +195,10 @@ argument_specs: default: 9000 description: "Port of the management interface. Relevant only when something is exposed on the management interface - see the guide for details." type: "int" + keycloak_quarkus_jgroups_port: + default: 7800 + description: "jgroups cluster tcp port" + type: "int" keycloak_quarkus_java_heap_opts: default: "-Xms1024m -Xmx2048m" description: "Heap memory JVM setting" @@ -211,7 +211,7 @@ argument_specs: description: "Other JVM settings" type: "str" keycloak_quarkus_java_opts: - default: "{{ ' '.join((keycloak_quarkus_jgroups_opts, keycloak_quarkus_java_heap_opts, keycloak_quarkus_java_jvm_opts)) }}" + default: "{{ keycloak_quarkus_java_heap_opts + ' ' + keycloak_quarkus_java_jvm_opts }}" description: "JVM arguments, by default heap_opts + jvm_opts, if overriden it takes precedence over them" type: "str" keycloak_quarkus_additional_env_vars: @@ -259,10 +259,6 @@ argument_specs: default: true description: "If the server should expose health check endpoints on the management interface" type: "bool" - keycloak_quarkus_cache_remote: - description: "Whether to connect to remote cache infinispan server" - default: false - type: 'bool' keycloak_quarkus_cache_remote_username: default: "supervisor" description: "Username for connecting to infinispan" @@ -272,12 +268,8 @@ argument_specs: description: "Password for connecting to infinispan" type: "str" keycloak_quarkus_cache_remote_host: - default: "localhost" - description: "Hostname for connecting to infinispan" - type: "str" - keycloak_quarkus_cache_remote_port: - default: "11222" - description: "Port for connecting to infinispan" + default: "localhost:11222" + description: "host name/port for connecting to infinispan, eg. host1:11222;host2:11222" type: "str" keycloak_quarkus_cache_remote_sasl_mechanism: default: "SCRAM-SHA-512" @@ -476,94 +468,10 @@ argument_specs: description: "Path local to controller for offline/download of install archives" default: "{{ lookup('env', 'PWD') }}" type: "str" - keycloak_quarkus_cache_metrics_enabled: - description: 'Enable histograms for metrics for the embedded caches' - default: false - type: 'bool' - keycloak_quarkus_cache_embedded_authorization_max_count: - description: 'The maximum number of entries that can be stored in-memory by the authorization cache' - required: false - type: "int" - keycloak_quarkus_cache_embedded_client_sessions_max_count: - description: 'The maximum number of entries that can be stored in-memory by the clientSessions cache' - required: false - type: "int" - keycloak_quarkus_cache_embedded_crl_max_count: - description: 'The maximum number of entries that can be stored in-memory by the crl cache' - required: false - type: "int" - keycloak_quarkus_cache_embedded_keys_max_count: - description: 'The maximum number of entries that can be stored in-memory by the keys cache' - required: false - type: "int" - keycloak_quarkus_cache_embedded_offline_client_sessions_max_count: - description: 'The maximum number of entries that can be stored in-memory by the offlineClientSessions cache' - required: false - type: "int" - keycloak_quarkus_cache_embedded_offline_sessions_max_count: - description: 'The maximum number of entries that can be stored in-memory by the offlineSessions cache' - required: false - type: "int" - keycloak_quarkus_cache_embedded_realms_max_count: - description: 'The maximum number of entries that can be stored in-memory by the realms cache' - required: false - type: "int" - keycloak_quarkus_cache_embedded_sessions_max_count: - description: 'The maximum number of entries that can be stored in-memory by the sessions cache' - required: false - type: "int" - keycloak_quarkus_cache_embedded_users_max_count: - description: 'The maximum number of entries that can be stored in-memory by the users cache' - required: false - type: 'int' - keycloak_quarkus_cache_embedded_mtls_enabled: - description: 'Encrypts the network communication between Keycloak servers' - default: true - type: 'bool' - keycloak_quarkus_cache_embedded_mtls_key_store_file: - description: 'The Keystore file path' - default: "{{ keycloak.home }}/conf/cache_key_store.p12" - type: "str" - keycloak_quarkus_cache_embedded_mtls_key_store_password: - description: 'The password to access the Keystore' - default: '' - type: "str" - keycloak_quarkus_cache_embedded_mtls_rotation_interval_days: - description: 'Rotation period in days of automatic JGroups MTLS certificates' - default: 30 - type: 'int' - keycloak_quarkus_cache_embedded_mtls_trust_store_file: - description: 'The Truststore file path' - default: "{{ keycloak.home }}/conf/cache_trust_store.p12" - type: "str" - keycloak_quarkus_cache_embedded_mtls_trust_store_password: - description: 'The password to access the Truststore.' - default: '' - type: "str" - keycloak_quarkus_jgroups_port: - description: 'jgroups bind port' - default: 7800 - type: "int" - keycloak_quarkus_jgroups_bind_address: - description: 'jgroups bind address' - default: "{{ ansible_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' - default: "{{ keycloak_quarkus_jgroups_bind_address }}" - type: "str" - keycloak_quarkus_jgroups_external_port: - description: 'Port that other instances in the Keycloak cluster should use to contact this node' - default: "{{ keycloak_quarkus_jgroups_port }}" - type: "int" - keycloak_quarkus_jgroups_opts: - description: "JVM arguments for jgroups configuration" - default: "-Djgroups.bind.address={{ keycloak_quarkus_jgroups_bind_address }} -Djgroups.external_port={{ keycloak_quarkus_jgroups_external_port }} -Djgroups.external_addr={{ keycloak_quarkus_jgroups_external_addr }}" - type: "str" downstream: options: rhbk_version: - default: "26.2.5" + default: "26.0.7" description: "Red Hat Build of Keycloak version" type: "str" rhbk_archive: diff --git a/roles/keycloak_quarkus/tasks/debian.yml b/roles/keycloak_quarkus/tasks/debian.yml index 7e59204..4a36661 100644 --- a/roles/keycloak_quarkus/tasks/debian.yml +++ b/roles/keycloak_quarkus/tasks/debian.yml @@ -1,10 +1,6 @@ --- - name: Include firewall config tasks - ansible.builtin.include_tasks: - file: iptables.yml - apply: - tags: - - firewall + ansible.builtin.include_tasks: iptables.yml when: keycloak_quarkus_configure_iptables tags: - firewall diff --git a/roles/keycloak_quarkus/tasks/install.yml b/roles/keycloak_quarkus/tasks/install.yml index 73ff2c4..c664d05 100644 --- a/roles/keycloak_quarkus/tasks/install.yml +++ b/roles/keycloak_quarkus/tasks/install.yml @@ -17,27 +17,6 @@ path: "{{ keycloak.home }}" register: existing_deploy -- name: Stop and restart if existing deployment exists and install forced - when: existing_deploy.stat.exists and keycloak_quarkus_force_install | bool - block: - - name: "Stop the old {{ keycloak.service_name }} service" - become: true - failed_when: false - ansible.builtin.systemd: - name: keycloak - state: stopped - - name: "Remove the old {{ keycloak.service_name }} deployment" - become: true - ansible.builtin.file: - path: "{{ keycloak_quarkus_home }}" - state: absent - -- name: Check for an existing deployment after possible forced removal - become: true - ansible.builtin.stat: - path: "{{ keycloak_quarkus_home }}" - register: existing_deploy - - name: "Create {{ keycloak.service_name }} service user/group" become: true ansible.builtin.user: @@ -98,7 +77,6 @@ - not archive_path.stat.exists - rhbk_enable is defined and rhbk_enable - not keycloak.offline_install - - keycloak_quarkus_alternate_download_url is undefined block: - name: Retrieve product download using JBoss Network API middleware_automation.common.product_search: @@ -237,7 +215,6 @@ owner: "{{ keycloak.service_user }}" group: "{{ keycloak.service_group }}" mode: '0640' - checksum: "{{ item.checksum | default(omit) }}" become: true loop: "{{ keycloak_quarkus_providers }}" when: item.url is defined and item.url | length > 0 @@ -258,6 +235,7 @@ loop: "{{ keycloak_quarkus_providers }}" when: item.maven is defined no_log: "{{ item.maven.password is defined and item.maven.password | length > 0 | default(false) }}" + notify: "{{ ['invalidate keycloak theme cache', 'rebuild keycloak config', 'restart keycloak'] if not item.restart is defined or item.restart else [] }}" - name: "Copy maven providers" ansible.builtin.copy: @@ -266,12 +244,10 @@ owner: "{{ keycloak.service_user }}" group: "{{ keycloak.service_group }}" mode: '0640' - checksum: "{{ item.checksum | default(omit) }}" become: true loop: "{{ keycloak_quarkus_providers }}" when: item.maven is defined no_log: "{{ item.maven.password is defined and item.maven.password | length > 0 | default(false) }}" - notify: "{{ ['invalidate keycloak theme cache', 'rebuild keycloak config', 'restart keycloak'] if not item.restart is defined or item.restart else [] }}" - name: "Copy local providers" ansible.builtin.copy: @@ -280,7 +256,6 @@ owner: "{{ keycloak.service_user }}" group: "{{ keycloak.service_group }}" mode: '0640' - remote_src: "{{ item.remote | default(false) }}" become: true loop: "{{ keycloak_quarkus_providers }}" when: item.local_path is defined diff --git a/roles/keycloak_quarkus/tasks/main.yml b/roles/keycloak_quarkus/tasks/main.yml index 6a7a4b0..cca6764 100644 --- a/roles/keycloak_quarkus/tasks/main.yml +++ b/roles/keycloak_quarkus/tasks/main.yml @@ -1,58 +1,34 @@ --- # tasks file for keycloak - name: Check prerequisites - ansible.builtin.include_tasks: - file: prereqs.yml - apply: - tags: - - prereqs + ansible.builtin.include_tasks: prereqs.yml tags: - prereqs - always - name: Check for deprecations - ansible.builtin.include_tasks: - file: deprecations.yml - apply: - tags: - - always + ansible.builtin.include_tasks: deprecations.yml tags: - always - name: Distro specific tasks - ansible.builtin.include_tasks: - file: "{{ ansible_os_family | lower }}.yml" - apply: - tags: - - unbound + ansible.builtin.include_tasks: "{{ ansible_os_family | lower }}.yml" tags: - unbound - name: Include install tasks - ansible.builtin.include_tasks: - file: install.yml - apply: - tags: - - install + ansible.builtin.include_tasks: install.yml tags: - install - name: Include systemd tasks - ansible.builtin.include_tasks: - file: systemd.yml - apply: - tags: - - systemd + ansible.builtin.include_tasks: systemd.yml tags: - systemd - name: Include configuration key store tasks - ansible.builtin.include_tasks: - file: config_store.yml - apply: - tags: - - install when: keycloak.config_key_store_enabled + ansible.builtin.include_tasks: config_store.yml tags: - install @@ -63,8 +39,8 @@ { "name": item, "address": 'jgroups-' + item, - "inventory_host": hostvars[item].keycloak_quarkus_jgroups_ip | default(item) + '[' + (keycloak_quarkus_jgroups_port | string) + ']', - "value": hostvars[item].keycloak_quarkus_jgroups_ip | default(item) + "inventory_host": hostvars[item].ansible_default_ipv4.address | default(item) + '[' + (keycloak_quarkus_jgroups_port | string) + ']', + "value": hostvars[item].ansible_default_ipv4.address | default(item) } ] }} loop: "{{ ansible_play_batch }}" diff --git a/roles/keycloak_quarkus/tasks/redhat.yml b/roles/keycloak_quarkus/tasks/redhat.yml index 26d552b..093b930 100644 --- a/roles/keycloak_quarkus/tasks/redhat.yml +++ b/roles/keycloak_quarkus/tasks/redhat.yml @@ -1,10 +1,6 @@ --- - name: Include firewall config tasks - ansible.builtin.include_tasks: - file: firewalld.yml - apply: - tags: - - firewall + ansible.builtin.include_tasks: firewalld.yml when: keycloak_quarkus_configure_firewalld tags: - firewall diff --git a/roles/keycloak_quarkus/tasks/systemd.yml b/roles/keycloak_quarkus/tasks/systemd.yml index fda37f5..e22b9fe 100644 --- a/roles/keycloak_quarkus/tasks/systemd.yml +++ b/roles/keycloak_quarkus/tasks/systemd.yml @@ -10,7 +10,6 @@ vars: keycloak_sys_pkg_java_home: "{{ keycloak_quarkus_pkg_java_home }}" notify: - - rebuild keycloak config - restart keycloak - name: "Configure systemd unit file for keycloak service" diff --git a/roles/keycloak_quarkus/templates/cache-ispn.xml.j2 b/roles/keycloak_quarkus/templates/cache-ispn.xml.j2 index cf74656..e546ab8 100644 --- a/roles/keycloak_quarkus/templates/cache-ispn.xml.j2 +++ b/roles/keycloak_quarkus/templates/cache-ispn.xml.j2 @@ -22,9 +22,7 @@ xmlns="urn:infinispan:config:15.0"> {% set stack_expression='' %} -{% if keycloak_quarkus_version is version_compare('26.2.0', '<') %} -{% if keycloak_quarkus_ha_enabled %} -{% if keycloak_quarkus_ha_discovery == 'TCPPING' %} +{% if keycloak_quarkus_ha_enabled and keycloak_quarkus_ha_discovery == 'TCPPING' %} {% set stack_expression='stack="tcpping"' %} @@ -37,10 +35,6 @@ /> -{% elif keycloak_quarkus_ha_discovery == 'JDBCPING' %} -{% set stack_expression='stack="JDBC_PING2"' %} -{% endif %} -{% endif %} {% endif %} @@ -99,14 +93,6 @@ - - - - - - - - diff --git a/roles/keycloak_quarkus/templates/keycloak.conf.j2 b/roles/keycloak_quarkus/templates/keycloak.conf.j2 index 7642715..99790c3 100644 --- a/roles/keycloak_quarkus/templates/keycloak.conf.j2 +++ b/roles/keycloak_quarkus/templates/keycloak.conf.j2 @@ -59,12 +59,8 @@ hostname-backchannel-dynamic={{ keycloak_quarkus_hostname_backchannel_dynamic | {% if keycloak_quarkus_ha_enabled %} cache=ispn cache-config-file=cache-ispn.xml -{% if keycloak_quarkus_cache_remote %} -cache-remote-username={{ keycloak_quarkus_cache_remote_username }} -cache-remote-password={{ keycloak_quarkus_cache_remote_password }} -cache-remote-host={{ keycloak_quarkus_cache_remote_host }} -cache-remote-port={{ keycloak_quarkus_cache_remote_port }} -cache-remote-tls-enabled={{ keycloak_quarkus_cache_remote_tls_enabled | lower }} +{% if keycloak_quarkus_ha_enabled and keycloak_quarkus_ha_discovery == 'TCPPING' %} +# cache-stack=tcp # configured directly in `cache-ispn.xml` {% endif %} {% endif %} diff --git a/roles/keycloak_quarkus/templates/quarkus.properties.j2 b/roles/keycloak_quarkus/templates/quarkus.properties.j2 index cd0f969..93152e8 100644 --- a/roles/keycloak_quarkus/templates/quarkus.properties.j2 +++ b/roles/keycloak_quarkus/templates/quarkus.properties.j2 @@ -1,22 +1,22 @@ {{ ansible_managed | comment }} {% if keycloak_quarkus_ha_enabled %} {% if keycloak_quarkus_version.split('.')[0] | int < 22 %} -quarkus.infinispan-client.server-list={{ keycloak_quarkus_cache_remote_host }}:{{ keycloak_quarkus_cache_remote_port }} -quarkus.infinispan-client.auth-username={{ keycloak_quarkus_cache_remote_username }} -quarkus.infinispan-client.auth-password={{ keycloak_quarkus_cache_remote_password }} +quarkus.infinispan-client.server-list={{ keycloak_quarkus_ispn_hosts }} +quarkus.infinispan-client.auth-username={{ keycloak_quarkus_ispn_user }} +quarkus.infinispan-client.auth-password={{ keycloak_quarkus_ispn_pass }} {% else %} -quarkus.infinispan-client.hosts={{ keycloak_quarkus_cache_remote_host }}:{{ keycloak_quarkus_cache_remote_port }} -quarkus.infinispan-client.username={{ keycloak_quarkus_cache_remote_username }} -quarkus.infinispan-client.password={{ keycloak_quarkus_cache_remote_password }} +quarkus.infinispan-client.hosts={{ keycloak_quarkus_ispn_hosts }} +quarkus.infinispan-client.username={{ keycloak_quarkus_ispn_user }} +quarkus.infinispan-client.password={{ keycloak_quarkus_ispn_pass }} {% endif %} quarkus.infinispan-client.client-intelligence=HASH_DISTRIBUTION_AWARE quarkus.infinispan-client.use-auth=true quarkus.infinispan-client.auth-realm=default quarkus.infinispan-client.auth-server-name=infinispan -quarkus.infinispan-client.sasl-mechanism={{ keycloak_quarkus_cache_remote_sasl_mechanism }} -{% if keycloak_quarkus_cache_remote_tls_enabled %} -quarkus.infinispan-client.trust-store={{ keycloak_quarkus_https_trust_store_file }} -quarkus.infinispan-client.trust-store-password={{ keycloak_quarkus_https_trust_store_password }} +quarkus.infinispan-client.sasl-mechanism={{ keycloak_quarkus_ispn_sasl_mechanism }} +{% if keycloak_quarkus_ispn_use_ssl %} +quarkus.infinispan-client.trust-store={{ keycloak_quarkus_ispn_trust_store_path }} +quarkus.infinispan-client.trust-store-password={{ keycloak_quarkus_ispn_trust_store_password }} quarkus.infinispan-client.trust-store-type=jks {% endif %} #quarkus.infinispan-client.use-schema-registration=true diff --git a/roles/keycloak_quarkus/vars/debian.yml b/roles/keycloak_quarkus/vars/debian.yml index 5391dda..0af3443 100644 --- a/roles/keycloak_quarkus/vars/debian.yml +++ b/roles/keycloak_quarkus/vars/debian.yml @@ -1,5 +1,5 @@ --- -keycloak_quarkus_varjvm_package: "{{ keycloak_quarkus_jvm_package | default('openjdk-21-jdk-headless') }}" +keycloak_quarkus_varjvm_package: "{{ keycloak_quarkus_jvm_package | default('openjdk-17-jdk-headless') }}" keycloak_quarkus_prereq_package_list: - "{{ keycloak_quarkus_varjvm_package }}" - bash diff --git a/roles/keycloak_realm/README.md b/roles/keycloak_realm/README.md index 2fb8942..179784e 100644 --- a/roles/keycloak_realm/README.md +++ b/roles/keycloak_realm/README.md @@ -74,7 +74,6 @@ Refer to [docs](https://docs.ansible.com/ansible/latest/collections/community/ge - name: id: client_id: - secret: roles: realm: public_client: diff --git a/roles/keycloak_realm/tasks/main.yml b/roles/keycloak_realm/tasks/main.yml index 5c19d68..7595ba3 100644 --- a/roles/keycloak_realm/tasks/main.yml +++ b/roles/keycloak_realm/tasks/main.yml @@ -46,7 +46,7 @@ name: "{{ item.name }}" state: present provider_id: "{{ item.provider_id }}" - provider_type: "{{ item.provider_type | default('org.keycloak.storage.UserStorageProvider') }}" + provider_type: "{{ item.provider_type | default(org.keycloak.storage.UserStorageProvider) }}" config: "{{ item.config }}" mappers: "{{ item.mappers | default(omit) }}" no_log: "{{ keycloak_no_log | default('True') }}" @@ -76,7 +76,6 @@ default_roles: "{{ item.roles | default(omit) }}" client_id: "{{ item.client_id | default(omit) }}" id: "{{ item.id | default(omit) }}" - secret: "{{ item.secret | default(omit) }}" name: "{{ item.name | default(omit) }}" description: "{{ item.description | default(omit) }}" root_url: "{{ item.root_url | default('') }}"