Update changelog for release 1.1.1

Update keycloak.conf.j2

.ansible-lint

@@ -29,6 +29,7 @@ warn_list:
   - name[template]
   - name[casing]
   - fqcn[action]
+  - schema[meta]
 
 skip_list:
   - vars_should_not_be_used

CHANGELOG.rst

@@ -6,6 +6,14 @@ middleware_automation.keycloak Release Notes
 
 This changelog describes changes after version 0.2.6.
 
+v1.1.1
+======
+
+Bugfixes
+--------
+
+- keycloak-quarkus: fix ``cache-config-file`` path in keycloak.conf.j2 template `#53 <https://github.com/ansible-middleware/keycloak/pull/53>`_
+
 v1.1.0
 ======
 

changelogs/changelog.yaml

@@ -130,3 +130,13 @@ releases:
     - 47.yaml
     - 51.yaml
     release_date: '2023-01-09'
+  1.1.1:
+    changes:
+      bugfixes:
+      - 'keycloak-quarkus: fix ``cache-config-file`` path in keycloak.conf.j2 template
+        `#53 <https://github.com/ansible-middleware/keycloak/pull/53>`_
+
+        '
+    fragments:
+    - 53.yaml
+    release_date: '2023-03-07'

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: middleware_automation
 name: keycloak
-version: "1.1.0"
+version: "1.1.1"
 readme: README.md
 authors:
   - Romain Pelisse <rpelisse@redhat.com>

playbooks/keycloak.yml

@@ -3,7 +3,5 @@
   hosts: all
   vars:
     keycloak_admin_password: "remembertochangeme"
-  collections:
-    - middleware_automation.keycloak
   roles:
-    - keycloak
+    - middleware_automation.keycloak.keycloak

playbooks/keycloak_quarkus.yml

@@ -9,7 +9,5 @@
     keycloak_quarkus_https_enabled: True
     keycloak_quarkus_key_file: conf/key.pem
     keycloak_quarkus_cert_file: conf/cert.pem
-  collections:
-    - middleware_automation.keycloak
   roles:
-    - keycloak_quarkus
+    - middleware_automation.keycloak.keycloak_quarkus

playbooks/keycloak_realm.yml

@@ -22,7 +22,5 @@
             - client: TestClient1
               role: TestClient1User
               realm: "{{ keycloak_realm }}"
-  collections:
-    - middleware_automation.keycloak  
   roles:
-    - keycloak_realm
+    - middleware_automation.keycloak.keycloak_realm

playbooks/rhsso.yml

@@ -4,9 +4,6 @@
   vars:
     keycloak_admin_password: "remembertochangeme"
     sso_enable: True
-  collections:
-    - middleware_automation.redhat_csp_download
-    - middleware_automation.keycloak
   roles:
     - middleware_automation.redhat_csp_download.redhat_csp_download
     - middleware_automation.keycloak.keycloak

roles/keycloak/tasks/install.yml

@@ -17,6 +17,7 @@
   register: existing_deploy
 
 - name: Stop and restart if existing deployment exists and install forced
+  when: existing_deploy.stat.exists and keycloak_force_install | bool
   block:
     - name: "Stop the old {{ keycloak.service_name }} service"
       become: yes
@@ -29,7 +30,6 @@
       ansible.builtin.file:
         path: "{{ keycloak_jboss_home }}"
         state: absent
-  when: existing_deploy.stat.exists and keycloak_force_install|bool
 
 - name: Check for an existing deployment after possible forced removal
   become: yes
@@ -185,7 +185,7 @@
     mode: 0640
   notify:
     - restart keycloak
-  when: not keycloak_remotecache.enabled or keycloak_config_override_template|length > 0
+  when: not keycloak_remotecache.enabled or keycloak_config_override_template | length > 0
 
 - name: "Deploy {{ keycloak.service_name }} config with remote cache store to {{ keycloak_config_path_to_standalone_xml }}"
   become: yes

roles/keycloak/vars/main.yml

@@ -46,7 +46,7 @@ keycloak_jdbc:
     driver_jar_filename: "mariadb-java-client-{{ keycloak_jdbc_driver_version }}.jar"
     driver_jar_url: "https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/{{ keycloak_jdbc_driver_version }}/mariadb-java-client-{{ keycloak_jdbc_driver_version }}.jar"
     connection_url: "{{ keycloak_jdbc_url }}"
-    db_user: "{{ keycloak_db_user  }}"
+    db_user: "{{ keycloak_db_user }}"
     db_password: "{{ keycloak_db_pass }}"
     initialize_db: >
       CREATE TABLE IF NOT EXISTS JGROUPSPING (

roles/keycloak_quarkus/meta/main.yml

@@ -1,6 +1,4 @@
 ---
-collections:
-
 galaxy_info:
   role_name: keycloak_quarkus
   namespace: middleware_automation

roles/keycloak_quarkus/templates/keycloak.conf.j2

@@ -30,7 +30,7 @@ hostname-path={{ keycloak_quarkus_http_relative_path }}
 # Cluster
 {% if keycloak_quarkus_ha_enabled %}
 cache=ispn
-cache-config-file=conf/cache-ispn.xml
+cache-config-file=cache-ispn.xml
 cache-stack=tcp
 {% endif %}
 

roles/keycloak_realm/tasks/main.yml

@@ -27,7 +27,7 @@
   ansible.builtin.uri:
     url: "{{ keycloak_url }}{{ keycloak_context }}/admin/realms"
     method: POST
-    body: "{{ lookup('template','realm.json.j2') }}"
+    body: "{{ lookup('template', 'realm.json.j2') }}"
     validate_certs: no
     body_format: json
     headers: