diff --git a/roles/podman_keycloak/templates/keycloak.container b/roles/podman_keycloak/templates/keycloak.container index f98147f..cbb7094 100644 --- a/roles/podman_keycloak/templates/keycloak.container +++ b/roles/podman_keycloak/templates/keycloak.container @@ -19,7 +19,7 @@ Environment=KC_BOOTSTRAP_ADMIN_USERNAME={{ podman_keycloak_keycloak_admin_userna Environment=KC_BOOTSTRAP_ADMIN_PASSWORD={{ podman_keycloak_keycloak_admin_password }} Environment=PROXY_ADDRESS_FORWARDING=true Exec=start --features=quick-theme -Image=quay.io/keycloak/keycloak:26.6 +Image=quay.io/keycloak/keycloak:26.4 Network=keycloak.network {% if podman_keycloak_enable_ldap %} Network=ldap.network diff --git a/roles/podman_prometheus/tasks/main.yml b/roles/podman_prometheus/tasks/main.yml index f9f6554..d3c60e1 100644 --- a/roles/podman_prometheus/tasks/main.yml +++ b/roles/podman_prometheus/tasks/main.yml @@ -29,15 +29,15 @@ - name: Podman Prometheus | AUDIT | Parse outputs of getsubids and store results ansible.builtin.set_fact: - _podman_prometheus_user_subuid_start: "{{ _podman_prometheus_user_subuid.stdout_lines[0].split()[2] }}" - _podman_prometheus_user_subgid_start: "{{ _podman_prometheus_user_subgid.stdout_lines[0].split()[2] }}" + _podman_prometheus_user_subuid_start: "{{ (_podman_prometheus_user_subuid.stdout_lines[0].split()[2] | int) }}" + _podman_prometheus_user_subgid_start: "{{ (_podman_prometheus_user_subgid.stdout_lines[0].split()[2] | int) }}" # Prometheus runs with UID/GID 65534 inside the container - name: Podman Prometheus | PATCH | Create data directory for Prometheus ansible.builtin.file: path: "/home/{{ podman_prometheus_podman_rootless_user }}/prometheus-data" - owner: "{{ (_podman_prometheus_user_subuid_start | int) + 65533 }}" - group: "{{ (_podman_prometheus_user_subgid_start | int) + 65533 }}" + owner: "{{ _podman_prometheus_user_subuid_start + 65533 }}" + group: "{{ _podman_prometheus_user_subgid_start + 65533 }}" mode: "0700" state: "directory" become: true @@ -46,8 +46,8 @@ - name: Podman Prometheus | PATCH | Create service discovery directory for Prometheus ansible.builtin.file: path: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs" - owner: "{{ (_podman_prometheus_user_subuid_start | int) + 65533 }}" - group: "{{ (_podman_prometheus_user_subgid_start | int) + 65533 }}" + owner: "{{ _podman_prometheus_user_subuid_start + 65533 }}" + group: "{{ _podman_prometheus_user_subgid_start + 65533 }}" mode: "0700" state: "directory" become: true @@ -58,8 +58,8 @@ src: "home/podman/{{ item }}" dest: "/home/{{ podman_prometheus_podman_rootless_user }}/{{ item }}" mode: "0400" - owner: "{{ (_podman_prometheus_user_subuid_start | int) + 65533 }}" - group: "{{ (_podman_prometheus_user_subgid_start | int) + 65533 }}" + owner: "{{ _podman_prometheus_user_subuid_start + 65533 }}" + group: "{{ _podman_prometheus_user_subgid_start + 65533 }}" become: true with_items: - prometheus.yml @@ -71,8 +71,8 @@ src: "home/podman/{{ item }}" dest: "/home/{{ podman_prometheus_podman_rootless_user }}/{{ item }}" mode: "0400" - owner: "{{ (_podman_prometheus_user_subuid_start | int) + 65533 }}" - group: "{{ (_podman_prometheus_user_subgid_start | int) + 65533 }}" + owner: "{{ _podman_prometheus_user_subuid_start + 65533 }}" + group: "{{ _podman_prometheus_user_subgid_start + 65533 }}" become: true with_items: - alert.rules.yml @@ -85,8 +85,8 @@ src: home/podman/alertmanager.yml dest: "/home/{{ podman_prometheus_podman_rootless_user }}/alertmanager.yml" mode: "0400" - owner: "{{ (_podman_prometheus_user_subuid_start | int) + 65533 }}" - group: "{{ (_podman_prometheus_user_subgid_start | int) + 65533 }}" + owner: "{{ _podman_prometheus_user_subuid_start + 65533 }}" + group: "{{ _podman_prometheus_user_subgid_start + 65533 }}" become: true notify: - Restart Alertmanager @@ -95,8 +95,8 @@ - name: Podman Prometheus | PATCH | Create data directory for Grafana ansible.builtin.file: path: "/home/{{ podman_prometheus_podman_rootless_user }}/grafana-data" - owner: "{{ (_podman_prometheus_user_subuid_start | int) + 471 }}" - group: "{{ (_podman_prometheus_user_subgid_start | int) + 471 }}" + owner: "{{ _podman_prometheus_user_subuid_start + 471 }}" + group: "{{ _podman_prometheus_user_subgid_start + 471 }}" mode: "0700" state: "directory" become: true