Skip to content

Commit 9fba85a

Browse files
committed
Merge remote-tracking branch 'origin/develop' into INDATA-152
* origin/develop: refactor(ansible): bring our ansible up to modern ansible-lint standards (#1861) fix: bump admin-api with enforce ssl fix (#1857) feat: support multiple versions of the pg_repack extension (#1688) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1856)
2 parents 72a3d76 + 5d43513 commit 9fba85a

File tree

8 files changed

+634
-302
lines changed

8 files changed

+634
-302
lines changed
Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
11
- name: AWS CLI dep
2-
apt:
2+
ansible.builtin.apt:
3+
install_recommends: false
34
pkg:
4-
- unzip
55
- jq
6-
install_recommends: no
6+
- unzip
77

8-
- name: AWS CLI (arm)
9-
get_url:
10-
url: "https://awscli.amazonaws.com/awscli-exe-linux-aarch64-{{ aws_cli_release }}.zip"
11-
dest: "/tmp/awscliv2.zip"
8+
- name: AWS CLI - get
9+
ansible.builtin.get_url:
10+
dest: '/tmp/awscliv2.zip'
1211
timeout: 60
13-
when: platform == "arm64"
12+
url: "https://awscli.amazonaws.com/awscli-exe-linux-{{ 'aarch64' if platform == 'arm64' else 'x86_64' }}-{{ aws_cli_release }}.zip"
1413

15-
- name: AWS CLI (x86)
16-
get_url:
17-
url: "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-{{ aws_cli_release }}.zip"
18-
dest: "/tmp/awscliv2.zip"
19-
timeout: 60
20-
when: platform == "amd64"
2114

2215
- name: AWS CLI - expand
23-
unarchive:
24-
remote_src: yes
25-
src: "/tmp/awscliv2.zip"
26-
dest: "/tmp"
16+
ansible.builtin.unarchive:
17+
dest: '/tmp'
18+
remote_src: true
19+
src: '/tmp/awscliv2.zip'
2720

2821
- name: AWS CLI - install
29-
shell: "/tmp/aws/install --update"
22+
ansible.builtin.command:
23+
cmd: /tmp/aws/install --update
3024
become: true
3125

3226
- name: install utilities to manage Amazon EC2 instance storage
33-
become: true
34-
apt:
27+
ansible.builtin.apt:
3528
pkg:
3629
- amazon-ec2-utils
30+
become: true
3731

3832
- name: AWS CLI - configure ipv6 support for s3
39-
shell: |
40-
aws configure set default.s3.use_dualstack_endpoint true
33+
ansible.builtin.command:
34+
cmd: aws configure set default.s3.use_dualstack_endpoint true
4135

4236
- name: install Vector for logging
43-
become: true
4437
apt:
45-
deb: "{{ vector_x86_deb }}"
46-
when: platform == "amd64"
47-
48-
- name: install Vector for logging
38+
deb: "{{ vector_x86_deb if platform == 'amd64' else vector_arm_deb }}"
4939
become: true
50-
apt:
51-
deb: "{{ vector_arm_deb }}"
52-
when: platform == "arm64"
5340

5441
- name: add Vector to postgres group
42+
ansible.builtin.user:
43+
append: true
44+
groups: 'postgres'
45+
name: 'vector'
5546
become: true
56-
shell:
57-
cmd: |
58-
usermod -a -G postgres vector
5947

6048
- name: create service files for Vector
61-
template:
62-
src: files/vector.service.j2
63-
dest: /etc/systemd/system/vector.service
49+
ansible.builtin.template:
50+
src: 'files/vector.service.j2'
51+
dest: '/etc/systemd/system/vector.service'
6452

6553
- name: configure tmpfiles for postgres - overwrites upstream package
66-
template:
67-
src: files/postgresql_config/tmpfiles.postgresql.conf
68-
dest: /etc/tmpfiles.d/postgresql-common.conf
54+
ansible.builtin.template:
55+
src: 'files/postgresql_config/tmpfiles.postgresql.conf'
56+
dest: '/etc/tmpfiles.d/postgresql-common.conf'
6957

7058
- name: fix permissions for vector config to be managed
71-
shell:
72-
cmd: |
73-
chown -R vector:vector /etc/vector
74-
chmod 0775 /etc/vector
59+
ansible.builtin.file:
60+
group: 'vector'
61+
mode: '0775'
62+
owner: 'vector'
63+
path: '/etc/vector'
64+
recurse: true
65+
state: 'directory'
7566

7667
- name: vector - reload systemd
77-
systemd:
78-
daemon_reload: yes
68+
ansible.builtin.systemd_service:
69+
daemon_reload: true
7970

8071
- name: Create checkpoints dir
72+
ansible.builtin.file:
73+
owner: 'vector'
74+
path: '/var/lib/vector'
75+
state: 'directory'
8176
become: true
82-
file:
83-
path: /var/lib/vector
84-
state: directory
85-
owner: vector
8677

8778
- name: Install Postgres exporter
88-
import_tasks: internal/postgres-exporter.yml
79+
ansible.builtin.import_tasks:
80+
file: internal/postgres-exporter.yml
8981

9082
- name: Install admin-mgr
91-
import_tasks: internal/admin-mgr.yml
83+
ansible.builtin.import_tasks:
84+
file: internal/admin-mgr.yml
9285

9386
- name: Install adminapi
94-
import_tasks: internal/admin-api.yml
87+
ansible.builtin.import_tasks:
88+
file: internal/admin-api.yml
9589

9690
- name: Init nftabless
97-
import_tasks: internal/setup-nftables.yml
91+
ansible.builtin.import_tasks:
92+
file: internal/setup-nftables.yml
9893

9994
- name: Install pg_egress_collect
100-
import_tasks: internal/pg_egress_collect.yml
95+
ansible.builtin.import_tasks:
96+
file: internal/pg_egress_collect.yml
10197

10298
- name: Install PostgreSQL prestart script
103-
import_tasks: internal/postgresql-prestart.yml
99+
ansible.builtin.import_tasks:
100+
file: internal/postgresql-prestart.yml
104101

105102
- name: Install salt minion
106-
import_tasks: internal/install-salt.yml
103+
ansible.builtin.import_tasks:
104+
file: internal/install-salt.yml
107105
tags:
108106
- aws-only
109107

110108
- name: Install supabase-admin-agent
111-
import_tasks: internal/supabase-admin-agent.yml
109+
ansible.builtin.import_tasks:
110+
file: internal/supabase-admin-agent.yml
112111
tags:
113112
- aws-only
114113

115114
- name: Envoy - use lds.supabase.yaml for /etc/envoy/lds.yaml
116-
command: mv /etc/envoy/lds.supabase.yaml /etc/envoy/lds.yaml
115+
ansible.builtin.command:
116+
cmd: mv /etc/envoy/lds.supabase.yaml /etc/envoy/lds.yaml

0 commit comments

Comments
 (0)