fix non-Amazon distro support

roles/aws_common/tasks/main.yml

@@ -5,8 +5,13 @@
   tags:
     - notest
 
-- name: Install distro-specific prerequisites
+- name: Install Amazon-Linux-specific prerequisites
   ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}.yml"
+  when: ansible_distribution | lower == 'amazon'
+
+- name: Install Ubuntu/Debian-specific prerequisites
+  ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}.yml"
+  when: ansible_distribution | lower != 'amazon'
 
 - name: Use EC2 instance ID for cluster node ID
   ansible.builtin.set_fact:

roles/confluence_config/tasks/main.yml

@@ -129,5 +129,10 @@
     mode: 0755
   with_items: "{{ atl_fonts_fallback_dirs }}"
 
-- name: Install & configure distro language fonts
+- name: Install & configure Amazon-Linux-specific language fonts
   ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}_fonts.yml"
+  when: ansible_distribution | lower == 'amazon'
+
+- name: Install & configure Ubuntu/Debian-specific language fonts
+  ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}_fonts.yml"
+  when: ansible_distribution | lower != 'amazon'

roles/linux_common/tasks/main.yml

@@ -2,8 +2,13 @@
 
 # Note: Try and limit these to packages that are distro-specific, and
 # place commonly-named ones below.
-- name: Install distro-specific prerequisites
+- name: Install Amazon-Linux-specific prerequisites
   ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}.yml"
+  when: ansible_distribution | lower == 'amazon'
+
+- name: Install Ubuntu/Debian-specific prerequisites
+  ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}.yml"
+  when: ansible_distribution | lower != 'amazon'
 
 - name: Install common support packages
   ansible.builtin.package:

roles/nfs_server/tasks/main.yml

@@ -1,8 +1,12 @@
 ---
 
-- name: Install distro-specific NFS packages
+- name: Install Amazon-Linux-specific NFS packages
   ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}.yml"
+  when: ansible_distribution | lower == 'amazon'
 
+- name: Install Ubuntu/Debian-specific NFS packages
+  ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}.yml"
+  when: ansible_distribution | lower != 'amazon'
 
 - name: Create mountpoint
   ansible.builtin.file:

roles/product_common/tasks/main.yml

@@ -1,4 +1,9 @@
 ---
 
-- name: Perform distro-specific tasks
+- name: Perform Amazon-Linux-specific tasks
   ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}.yml"
+  when: ansible_distribution | lower == 'amazon'
+
+- name: Perform Ubuntu/Debian-specific tasks
+  ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}.yml"
+  when: ansible_distribution | lower != 'amazon'