blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-16 09:53:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix non-Amazon distro support

Browse Source
This commit is contained in:
Lee Goolsbee
2022-12-13 20:41:29 -06:00
parent a64212d326
commit cff3b77516
5 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
roles/aws_common/tasks/main.yml
View File

@@ -5,8 +5,13 @@
tags: tags:
- notest - notest
- name: Install distro-specific prerequisites - name: Install Amazon-Linux-specific prerequisites
ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}.yml" 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 - name: Use EC2 instance ID for cluster node ID
ansible.builtin.set_fact: ansible.builtin.set_fact:

7
roles/confluence_config/tasks/main.yml
View File

@@ -129,5 +129,10 @@
mode: 0755 mode: 0755
with_items: "{{ atl_fonts_fallback_dirs }}" 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" 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'

7
roles/linux_common/tasks/main.yml
View File

@@ -2,8 +2,13 @@
# Note: Try and limit these to packages that are distro-specific, and # Note: Try and limit these to packages that are distro-specific, and
# place commonly-named ones below. # 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" 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 - name: Install common support packages
ansible.builtin.package: ansible.builtin.package:

6
roles/nfs_server/tasks/main.yml
View File

@@ -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" 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 - name: Create mountpoint
ansible.builtin.file: ansible.builtin.file:

7
roles/product_common/tasks/main.yml
View File

@@ -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" 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'