Improve package installation

roles/common/tasks/main.yml

@@ -1,17 +1,8 @@
 ---
-- name: "Update apt cache if running on Debian system"
-  apt:
-    update_cache: yes
-  when: ansible_os_family == 'Debian'
-
-- name: "Update yum cache if running on RedHat system"
-  yum:
-    update_cache: yes
-  when: ansible_os_family == 'RedHat'
 
 - name: "Installing common packages"
   package:
-    state: latest
+    state: present
     name:
       - htop
       - unzip

roles/dev_common/meta/main.yml

@@ -1,4 +1,5 @@
 ---
 
 dependencies:
+  - role: java
   - role: payara

roles/dev_common/tasks/main.yml

@@ -1,17 +1,18 @@
 ---
-- include_vars: vars/redhat.yml
-  when: ansible_os_family == 'RedHat'
 
-- include_vars: vars/debian-16.yml
-  when: ansible_os_family == 'Debian' and ansible_distribution_major_version == '16'
-
-- include_vars: vars/debian-20.yml
-  when: ansible_os_family == 'Debian' and ansible_distribution_major_version == '20'
+- name: "Install Java -devel package (RedHat only)"
+  package:
+    state: present
+    name: "java-{{ java_version }}-openjdk-devel"
+  when: ansible_os_family == "RedHat"
 
 - name: "Installing common dev packages"
   package:
-    state: latest
-    name: "{{ dev_common_pkgs }}"
+    state: present
+    name:
+      - git
+      - maven
+      - python3-pip
 
 - name: "Installing common dev python packages"
   pip:

roles/icat_server/tasks/main.yml

@@ -2,15 +2,12 @@
 - include_vars: vars/redhat.yml
   when: ansible_os_family == 'RedHat'
 
-- include_vars: vars/debian-16.yml
-  when: ansible_os_family == 'Debian' and ansible_distribution_major_version == '16'
-
-- include_vars: vars/debian-20.yml
-  when: ansible_os_family == 'Debian' and ansible_distribution_major_version == '20'
+- include_vars: vars/debian.yml
+  when: ansible_os_family == 'Debian'
 
 - name: "Install common icat_server dependencies"
   package:
-    state: latest
+    state: present
     name: "{{ icat_server_pkgs }}"
 
 - name: "Check icat_server package"

roles/java/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
 
-# Either choose '8' or '11'
+# Either choose '11' or '17'
 java_version: '11'

roles/java/tasks/main.yml

@@ -1,17 +1,12 @@
 ---
-- include_vars: vars/redhat-java-8.yml
-  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7' and java_version == '8'
 
-- include_vars: vars/redhat-java-11.yml
-  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7' and java_version == '11'
+- include_vars: vars/redhat.yml
+  when: ansible_os_family == 'RedHat'
 
-- include_vars: vars/debian-java-8.yml
-  when: ansible_os_family == 'Debian' and ( ansible_distribution_major_version == '16' or ansible_distribution_major_version == '20') and java_version == '8'
-
-- include_vars: vars/debian-java-11.yml
-  when: ansible_os_family == 'Debian' and ( ansible_distribution_major_version == '16' or ansible_distribution_major_version == '20') and java_version == '11'
+- include_vars: vars/debian.yml
+  when: ansible_os_family == 'Debian'
 
 - name: "Install Java packages"
   package:
-    state: latest
+    state: present
     name: "{{ java_pkgs }}"

roles/java/vars/debian.yml

@@ -0,0 +1,6 @@
+---
+
+java_pkgs:
+  - openjdk-{{ java_version }}-jdk-headless
+
+java_dir: /usr/lib/jvm/java-{{ java_version }}-openjdk-amd64

roles/java/vars/redhat.yml

@@ -0,0 +1,6 @@
+---
+
+java_pkgs:
+  - java-{{ java_version }}-openjdk-headless
+
+java_dir: /usr/lib/jvm/java-{{ java_version }}-openjdk

roles/mariadb/tasks/main.yml

@@ -2,15 +2,12 @@
 - include_vars: vars/redhat.yml
   when: ansible_os_family == 'RedHat'
 
-- include_vars: vars/debian-16.yml
-  when: ansible_os_family == 'Debian' and ansible_distribution_major_version == '16'
-
-- include_vars: vars/debian-20.yml
-  when: ansible_os_family == 'Debian' and ansible_distribution_major_version == '20'
+- include_vars: vars/debian.yml
+  when: ansible_os_family == 'Debian'
 
 - name: "Install mariadb packages"
   package:
-    state: latest
+    state: present
     name: "{{ mariadb_pkgs }}"
 
 - name: "Configure default storage engine"

roles/mariadb/vars/debian-16.yml → roles/mariadb/vars/debian.yml

@@ -4,4 +4,4 @@ mariadb_config_dir: /etc/mysql/conf.d
 mariadb_pkgs:
   - mariadb-server
   - mariadb-client
-  - python-mysqldb
+  - python3-mysqldb

roles/payara/tasks/main.yml

@@ -129,19 +129,11 @@
     executable: /bin/bash
   when: installationResult.stat.exists is defined and installationResult.stat.exists == false
 
-- name: 'Make sure we are using the correct java version for payara for Debian systems (Ubuntu 16.04 & 20.04)'
+- name: 'Make sure we are using the correct java version for payara'
   lineinfile:
     path: /home/{{ payara_user }}/{{ payara_directory }}/glassfish/config/asenv.conf
-    line: 'AS_JAVA="/usr/lib/jvm/java-1.{{ java_version }}.0-openjdk-amd64"'
+    line: 'AS_JAVA="{{ java_dir }}"'
     regexp: '^AS_JAVA='
-  when: ansible_os_family == 'Debian' and ( ansible_distribution_major_version == '16' or ansible_distribution_major_version == '20')
-
-- name: 'Make sure we are using the correct java version for payara for Red Hat systems (EL 7)'
-  lineinfile:
-    path: /home/{{ payara_user }}/{{ payara_directory }}/glassfish/config/asenv.conf
-    line: 'AS_JAVA="/usr/lib/jvm/java-{{ java_version }}-openjdk"'
-    regexp: '^AS_JAVA='
-  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7'
 
 - name: 'Temporary fix for https://github.com/payara/Payara/issues/6344'
   lineinfile: