Revert "Merge branch '4.8.1' into merge-4.8.1-into-4.9.0"
This reverts commit7b21e25c48, reversing changes made to93f88d2e1f.
This commit is contained in:
parent
2c5f6c02bc
commit
713e2b5152
@ -1,39 +1,18 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
- name: "Install dependencies"
|
- name: "Install dependencies"
|
||||||
block:
|
|
||||||
- name: "Install common dependencies"
|
|
||||||
package:
|
package:
|
||||||
name:
|
name:
|
||||||
- unzip
|
- unzip
|
||||||
- openssl
|
- openssl
|
||||||
- tar
|
- tar
|
||||||
|
- curl
|
||||||
state: present
|
state: present
|
||||||
register: package_status
|
register: package_status
|
||||||
until: "package_status is not failed"
|
until: "package_status is not failed"
|
||||||
retries: 10
|
retries: 10
|
||||||
delay: 10
|
delay: 10
|
||||||
|
|
||||||
- name: "Install curl"
|
|
||||||
package:
|
|
||||||
name: curl
|
|
||||||
state: present
|
|
||||||
when: ansible_distribution != "Amazon" and ansible_distribution_version != "2023"
|
|
||||||
register: package_status
|
|
||||||
until: "package_status is not failed"
|
|
||||||
retries: 10
|
|
||||||
delay: 10
|
|
||||||
|
|
||||||
- name: "Install curl minimal in AL2023"
|
|
||||||
package:
|
|
||||||
name: curl-minimal
|
|
||||||
state: present
|
|
||||||
when: ansible_distribution == "Amazon" and ansible_distribution_version == "2023"
|
|
||||||
register: package_status
|
|
||||||
until: "package_status is not failed"
|
|
||||||
retries: 10
|
|
||||||
delay: 10
|
|
||||||
|
|
||||||
- include_vars: ../../vars/repo_vars.yml
|
- include_vars: ../../vars/repo_vars.yml
|
||||||
|
|
||||||
- include_vars: ../../vars/repo.yml
|
- include_vars: ../../vars/repo.yml
|
||||||
|
|||||||
@ -12,15 +12,12 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
- name: Amazon Linux | Configure system settings
|
- name: Amazon Linux | Install Amazon extras
|
||||||
block:
|
block:
|
||||||
- name: Install Amazon extras in Amazon Linux 2
|
- name: Install Amazon extras
|
||||||
yum:
|
yum:
|
||||||
name: amazon-linux-extras
|
name: amazon-linux-extras
|
||||||
state: present
|
state: present
|
||||||
when:
|
|
||||||
- ansible_distribution == 'Amazon'
|
|
||||||
- ansible_distribution_major_version == '2'
|
|
||||||
|
|
||||||
- name: Configure vm.max_map_count
|
- name: Configure vm.max_map_count
|
||||||
lineinfile:
|
lineinfile:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user