From cff3b775165b1d51d12bb1e7fd359cccbb53e487 Mon Sep 17 00:00:00 2001 From: Lee Goolsbee Date: Tue, 13 Dec 2022 20:41:29 -0600 Subject: [PATCH] fix non-Amazon distro support --- roles/aws_common/tasks/main.yml | 7 ++++++- roles/confluence_config/tasks/main.yml | 7 ++++++- roles/linux_common/tasks/main.yml | 7 ++++++- roles/nfs_server/tasks/main.yml | 6 +++++- roles/product_common/tasks/main.yml | 7 ++++++- 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml index 2f75e38..552f05e 100644 --- a/roles/aws_common/tasks/main.yml +++ b/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: diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml index 99113ce..7e7d543 100644 --- a/roles/confluence_config/tasks/main.yml +++ b/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' diff --git a/roles/linux_common/tasks/main.yml b/roles/linux_common/tasks/main.yml index 0c822fe..6155140 100644 --- a/roles/linux_common/tasks/main.yml +++ b/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: diff --git a/roles/nfs_server/tasks/main.yml b/roles/nfs_server/tasks/main.yml index 84df09b..c2f2dc5 100644 --- a/roles/nfs_server/tasks/main.yml +++ b/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: diff --git a/roles/product_common/tasks/main.yml b/roles/product_common/tasks/main.yml index 7bf9015..f687ae5 100644 --- a/roles/product_common/tasks/main.yml +++ b/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'