From 9278d3440e1aaf15768a2eb7c70e2efec27c2c84 Mon Sep 17 00:00:00 2001
From: Guido Grazioli <ggraziol@redhat.com>
Date: Wed, 11 May 2022 11:33:52 +0200
Subject: [PATCH] ci: linter version update fixes

---
 .ansible-lint                                 | 4 +++-
 roles/keycloak/tasks/fastpackages.yml         | 3 ++-
 roles/keycloak/tasks/install.yml              | 3 ++-
 roles/keycloak/tasks/main.yml                 | 3 ++-
 roles/keycloak/vars/main.yml                  | 2 +-
 roles/keycloak_quarkus/tasks/fastpackages.yml | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index eef1f63..5472a97 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -16,12 +16,14 @@ enable_list:
 warn_list:
   - role_vars_start_with_role_name
   - vars_in_vars_files_have_valid_names
-  - vars_should_not_be_used
   - experimental
   - ignore-errors
   - no-handler
   - fqcn-builtins
   - no-log-password
 
+skip_list:
+  - vars_should_not_be_used
+
 use_default_rules: true
 parseable: true
diff --git a/roles/keycloak/tasks/fastpackages.yml b/roles/keycloak/tasks/fastpackages.yml
index 29155f9..78bc556 100644
--- a/roles/keycloak/tasks/fastpackages.yml
+++ b/roles/keycloak/tasks/fastpackages.yml
@@ -1,5 +1,6 @@
 ---
-- block:
+- name: Check packages to be installed
+  block:
   - name: "Check if packages are already installed"
     ansible.builtin.command: "rpm -q {{ packages_list | join(' ') }}"
     args:
diff --git a/roles/keycloak/tasks/install.yml b/roles/keycloak/tasks/install.yml
index 861bca0..26c5466 100644
--- a/roles/keycloak/tasks/install.yml
+++ b/roles/keycloak/tasks/install.yml
@@ -16,7 +16,8 @@
     path: "{{ keycloak_jboss_home }}"
   register: existing_deploy
 
-- block:
+- name: Stop and restart if existing deployment exists and install forced
+  block:
     - name: "Stop the old {{ keycloak.service_name }} service"
       become: yes
       ignore_errors: yes
diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml
index c16f6cb..ba5ec87 100644
--- a/roles/keycloak/tasks/main.yml
+++ b/roles/keycloak/tasks/main.yml
@@ -35,7 +35,8 @@
     src: "{{ keycloak_jboss_home }}/standalone/log"
     dest: /var/log/keycloak
 
-- block:
+- name: Set admin credentials and restart if not already created
+  block:
     - name: Check admin credentials by generating a token (supposed to fail on first installation)
       ansible.builtin.uri:
         url: "{{ keycloak_url }}/auth/realms/master/protocol/openid-connect/token"
diff --git a/roles/keycloak/vars/main.yml b/roles/keycloak/vars/main.yml
index f639970..5a6b059 100644
--- a/roles/keycloak/vars/main.yml
+++ b/roles/keycloak/vars/main.yml
@@ -1,7 +1,7 @@
 ---
 # internal variables below
 rhsso_rhn_ids:
-  '7.5.0':
+  '7.5.0': # noqa vars_in_vars_files_have_valid_names
     id: '101971'
     latest_cp:
       id: '103836'
diff --git a/roles/keycloak_quarkus/tasks/fastpackages.yml b/roles/keycloak_quarkus/tasks/fastpackages.yml
index 29155f9..78bc556 100644
--- a/roles/keycloak_quarkus/tasks/fastpackages.yml
+++ b/roles/keycloak_quarkus/tasks/fastpackages.yml
@@ -1,5 +1,6 @@
 ---
-- block:
+- name: Check packages to be installed
+  block:
   - name: "Check if packages are already installed"
     ansible.builtin.command: "rpm -q {{ packages_list | join(' ') }}"
     args: