Skip to content

Commit 0868c65

Browse files
committed
Migrate to Rocky Linux 9
1 parent 8907c9d commit 0868c65

File tree

136 files changed

+475
-1093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+475
-1093
lines changed

ansible.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
[defaults]
2-
ansible_python_interpreter = python
3-
42
remote_user = root
53
host_key_checking = no
64

group_vars/all.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -709,9 +709,7 @@ mageops_language_redirect_enable: no
709709
mageops_language_redirect_mode: normal
710710

711711
# Configure a vmtouch daemon force-keeping magento sources / compiled opcache in RAM
712-
mageops_magento_preload_fscache_enable: >-
713-
{{ ( ansible_memtotal_mb | default(512, true) | int >= 7168 )
714-
and php_cli_opcache_file_cache_enable | default(false, true) }}
712+
mageops_magento_preload_fscache_enable: no
715713

716714
# Tune Linux Virtual Memory kernel sysctl params for lower disk IO
717715
mageops_app_node_optimize_kernel_vm_io: yes
@@ -1315,7 +1313,7 @@ php_fpm_pool_name: "{{ mageops_app_type }}"
13151313

13161314
php_fpm_umask: "{{ mageops_app_umask }}"
13171315

1318-
php_fpm_run_dir_path: "/var/run/php-fpm"
1316+
php_fpm_run_dir_path: "/run/php-fpm"
13191317
php_fpm_log_dir_path: "/var/log/php-fpm"
13201318

13211319
php_fpm_pool_conf_dir_path: "/etc/php-fpm.d"
@@ -1541,7 +1539,7 @@ https_termination_proxy_http_port: "{{ https_termination_hide_varnish | default(
15411539
https_termination_proxy_read_timeout: "{{ mageops_http_pipeline_request_timeout_override }}"
15421540

15431541
# Special logging setup for requests for cacheable HTML pages which were a cache MISS
1544-
https_termination_page_cache_misses_logging: yes
1542+
https_termination_page_cache_misses_logging: no
15451543
https_termination_page_cache_misses_logfile: "{{ nginx_log_dir }}/access.page-cache-misses.json.log"
15461544

15471545
https_termination_redirect_source_domain_param: _redirect_from
@@ -1757,10 +1755,10 @@ deploy_release_save_info_file_path: "{{ mageops_ansible_temp_dir }}/RELEASE.json
17571755
# --------------------------------------
17581756

17591757
# Whether to install and enable the earlyoom daemon
1760-
mageops_earlyoom_enable: yes
1758+
mageops_earlyoom_enable: no
17611759

17621760
earlyoom_ram_min_percent: 7
1763-
earlyoom_swap_min_percent: 40
1761+
earlyoom_swap_min_percent: 10
17641762
mageops_cli_features_dir: /usr/local/lib/mageops/features
17651763

17661764
# ----------------------------
@@ -1779,11 +1777,8 @@ mageops_packages_banned:
17791777

17801778
# Basic packages needed for ansible/provisioning
17811779
mageops_packages_base:
1782-
- python
1783-
- python2-pip
1784-
- python2-PyMySQL
1785-
- yum-utils
1786-
- yum-plugin-verify
1780+
- python3-pip
1781+
- python3-PyMySQL
17871782
- unzip
17881783
- git
17891784
- rsync
@@ -1857,7 +1852,8 @@ packages_remove: "{{ mageops_packages_banned }}"
18571852
# Package locks, for more info, check cs.versionlock role
18581853

18591854
# Package locks per instance
1860-
versionlock_varnish_packages: []
1855+
versionlock_varnish_packages:
1856+
- varnish-6.0.*
18611857
versionlock_persistent_packages: []
18621858
versionlock_app_node_packages: []
18631859

requirements-galaxy.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
roles:
12
- src: geerlingguy.mysql
23
- src: geerlingguy.composer
34
- src: geerlingguy.ntp
@@ -8,9 +9,7 @@
89
- src: pinkeen.postfix-relay
910
version: v1.1
1011

11-
- src: pinkeen.selinux-disable
12-
version: v1.1
13-
14-
- src: zauberpony.mysql-query
15-
version: v0.6.1
16-
12+
collections:
13+
- name: community.aws
14+
- name: amazon.aws
15+
- name: community.mysql

requirements-python.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ansible>=2.9.16,<2.10
1+
ansible>=6,<7
22

33
# some tasks call aws command on localhost
44
# make sure this is BEFORE boto3 and boto
Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,2 @@
11
allow_duplicates: no
22
dependencies: []
3-
4-
galaxy_info:
5-
author: Filip Sobalski <filip.sobalski@creativestyle.pl>
6-
description: A collection of ansible plugins
7-
company: creativestyle Polska
8-
license: license (BSD, MIT)
9-
min_ansible_version: 2.7
10-
galaxy_tags:
11-
- plugins
12-
- filters
13-
- filter_plugins
14-
- ansible
15-
- meta
16-
- library
17-
18-

roles/cs.aws-ami-facts/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ami_facts_common_filters:
1414
# Find the latest CentOS ami ids here: https://www.centos.org/download/aws-images/
1515
ami_centos7_id:
1616
# eu-central-1: ami-08b6d44b4f6f7b279 # original
17-
eu-central-1: ami-0e4f9c05326f650df # cs-centos7-update-2022-08-01
17+
eu-central-1: ami-06a38f9c5f75d09bd # rocky 9.0.20220706
1818

1919
ami_base_system_image_id: "{{ ami_centos7_id[aws_region | default('eu-central-1')] }}"
2020

roles/cs.aws-ami-facts/tasks/find-app-node-ami.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
- name: Find app node AMIs
2-
ec2_ami_facts:
2+
amazon.aws.ec2_ami_info:
33
region: "{{ aws_region }}"
44
filters: >-
55
{{ ami_facts_common_filters | combine(
6-
ami_facts_app_node_base_filters,
7-
ami_facts_app_node_filters,
6+
ami_facts_app_node_base_filters,
7+
ami_facts_app_node_filters,
88
ami_facts_app_node_tag_filters) }}
99
vars:
1010
ami_facts_app_node_tag_filters: "{{ ami_facts_app_node_tags | prefix_keys('tag:') }}"
@@ -22,7 +22,7 @@
2222
aws_ami_app_node_id: "{{ aws_ami_app_node_info.image_id }}"
2323
aws_ami_app_node_name: "{{ aws_ami_app_node_info.name }}"
2424
aws_ami_app_node_location: "{{ aws_ami_app_node_info.image_location }}"
25-
aws_ami_app_node_needs_db_migrations: "{{ aws_ami_app_node_info.tags.NeedsDbMigrations | default('true') | from_json }}"
25+
aws_ami_app_node_needs_db_migrations: "{{ aws_ami_app_node_info.tags.NeedsDbMigrations | default('true') | from_json }}"
2626
aws_ami_app_node_artifact_build_nr: "{{ aws_ami_app_node_info.tags.ArtifactBuildNr | default('null') | from_json }}"
2727

2828
- name: Print information about newest app node AMI found
@@ -31,10 +31,10 @@
3131
msg: |
3232
===============================================================
3333
= Found App Node AMI =
34-
===============================================================
34+
===============================================================
3535
3636
{% if ami_facts_app_node_force_id %}Note: Using forced specific AMI id.{% endif %}
37-
37+
3838
{{ aws_ami_app_node_name }} ({{ aws_ami_app_node_id }})
3939
4040
Baked App artifact build: #{{ aws_ami_app_node_artifact_build_nr | default('unknown', true) }}
@@ -50,4 +50,4 @@
5050
- name: Print information if no images were found
5151
when: ami_app_node_facts.images | length == 0
5252
debug:
53-
msg: "No previous app node AMI was found! Clean build is coming..."
53+
msg: "No previous app node AMI was found! Clean build is coming..."

roles/cs.aws-ami-facts/tasks/find-clean-base-ami.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- name: Find clean base AMIs
2-
ec2_ami_facts:
2+
amazon.aws.ec2_ami_info:
33
region: "{{ aws_region }}"
44
filters: "{{ ami_facts_common_filters | combine(ami_facts_clean_base_filters) }}"
55
register: ami_clean_base_facts
@@ -30,5 +30,5 @@
3030
({{ aws_ami_clean_base_location }})
3131
3232
--- Details ---
33-
34-
{{ aws_ami_clean_base_info | to_nice_yaml }}
33+
34+
{{ aws_ami_clean_base_info | to_nice_yaml }}

roles/cs.aws-cli/tasks/main.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
- name: Make sure pip aws is not installed
2-
pip:
3-
name: awscli
4-
state: absent
1+
# - name: Make sure pip aws is not installed
2+
# pip:
3+
# name: awscli
4+
# state: absent
55

66
- name: Install awscli
7-
yum:
7+
ansible.builtin.package:
88
name: awscli
9-
enablerepo: mageops
109
state: latest
1110

1211
- name: Ensure default AWS Region is set
1312
ini_file:
1413
path: /root/.aws/credentials
1514
section: default
1615
option: region
17-
value: "{{ aws_region }}"
16+
value: "{{ aws_region }}"

roles/cs.aws-cloudfront-facts/tasks/main.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
- name: Get list of cloudfront distributions
2-
cloudfront_facts:
2+
community.aws.cloudfront_info:
33
region: "{{ aws_region }}"
4+
summary: yes
45
register: cloudfront_distributions_info
56

67
- name: Set list of cloudfront distributions
78
set_fact:
8-
aws_cloudfront_distributions: "{{ cloudfront_distributions_info.ansible_facts.cloudfront.summary.distributions }}"
9-
9+
aws_cloudfront_distributions: "{{ cloudfront_distributions_info.cloudfront.summary.distributions }}"
10+
1011
- name: Filter cloudfront distribution list by tags
1112
set_fact:
1213
aws_cloudfront_distributions: "{{ aws_cloudfront_distributions | json_query(distributions_tag_filter_query) }}"
1314
vars:
1415
distributions_tag_filter_query: "[?{% for k, v in aws_cloudfront_distribution_tags.items() -%}Tags.{{ k }} == '{{ v }}'{% if not loop.last %} && {% endif %}{% endfor %}]"
15-
16+
1617
- name: Warn when more than one distribution has been found
1718
debug:
1819
msg: |
@@ -31,4 +32,4 @@
3132
debug:
3233
msg: |
3334
Using Cloudfront Distribution: {{ aws_cloudfront_distribution_id }} with domain {{ aws_cloudfront_distribution_domain }}
34-
when: aws_cloudfront_distributions | length > 0
35+
when: aws_cloudfront_distributions | length > 0

0 commit comments

Comments
 (0)