mirror of
https://bitbucket.org/atlassian/dc-deployments-automation.git
synced 2025-12-14 00:43:06 -06:00
Merged in al2022 (pull request #187)
Add support for Amazon Linux 2022 * first pass at basic AL2022 support * unpin git version on AL2022 * resolve a few package issues/discrepancies * fix non-Amazon distro support * fix missing nfs.service symlink on AL2022 * remove Ubuntu/Debian install task from aws_common (no existing ubuntu dependency tasks) * add amazonlinux:2022 to list of images for testing via molecule * install amazon-cloudwatch-agent from package sources instead of direct RPM on AL2022; add workaround for missing group * fix typo in task name * add mising amazonlinux:2022 test for product_install role * al2022 -> al2023 * al2023 ships with rpm-installed versions of setuptools and distlib that aren't removable and older than what pipenv requires; use py3.11 instead Approved-by: Vadym Kovalskiy Approved-by: Eugene Ivantsov Approved-by: Yurii Kuzan
This commit is contained in:
@@ -6,6 +6,10 @@ platforms:
|
||||
image: amazonlinux:2
|
||||
groups:
|
||||
- aws_node_local
|
||||
- name: amazon_linux2023
|
||||
image: amazonlinux:2023
|
||||
groups:
|
||||
- aws_node_local
|
||||
# - name: ubuntu_lts
|
||||
# image: ubuntu:bionic
|
||||
provisioner:
|
||||
|
||||
@@ -6,6 +6,10 @@ platforms:
|
||||
image: amazonlinux:2
|
||||
groups:
|
||||
- aws_node_local
|
||||
- name: amazon_linux2023
|
||||
image: amazonlinux:2023
|
||||
groups:
|
||||
- aws_node_local
|
||||
# - name: ubuntu_lts
|
||||
# image: ubuntu:bionic
|
||||
provisioner:
|
||||
|
||||
@@ -6,6 +6,10 @@ platforms:
|
||||
image: amazonlinux:2
|
||||
groups:
|
||||
- aws_node_local
|
||||
- name: amazon_linux2023
|
||||
image: amazonlinux:2023
|
||||
groups:
|
||||
- aws_node_local
|
||||
# - name: ubuntu_lts
|
||||
# image: ubuntu:bionic
|
||||
provisioner:
|
||||
|
||||
25
roles/aws_common/tasks/amazon-2023.yml
Normal file
25
roles/aws_common/tasks/amazon-2023.yml
Normal file
@@ -0,0 +1,25 @@
|
||||
---
|
||||
|
||||
- name: Install AWS support packages
|
||||
ansible.builtin.dnf:
|
||||
name:
|
||||
- amazon-efs-utils
|
||||
- amazon-ssm-agent
|
||||
- awscli
|
||||
- git
|
||||
- ec2-utils
|
||||
|
||||
# https://github.com/amazonlinux/amazon-linux-2023/issues/164
|
||||
- name: Ensure group "aoc" exists
|
||||
ansible.builtin.group:
|
||||
name: aoc
|
||||
state: present
|
||||
when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch | bool
|
||||
|
||||
- name: Install CloudWatch Agent
|
||||
ansible.builtin.dnf:
|
||||
name:
|
||||
- amazon-cloudwatch-agent
|
||||
when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch | bool
|
||||
notify:
|
||||
- Enable CloudWatch Agent
|
||||
@@ -5,8 +5,9 @@
|
||||
tags:
|
||||
- notest
|
||||
|
||||
- name: Install distro-specific prerequisites
|
||||
ansible.builtin.include_tasks: "{{ ansible_distribution|lower }}.yml"
|
||||
- name: Install Amazon-Linux-specific prerequisites
|
||||
ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}.yml"
|
||||
when: ansible_distribution | lower == 'amazon'
|
||||
|
||||
- name: Use EC2 instance ID for cluster node ID
|
||||
ansible.builtin.set_fact:
|
||||
|
||||
Reference in New Issue
Block a user