Skip to content

Commit 6866569

Browse files
gildubgildub
committed
latest quadlet
1 parent b66d9db commit 6866569

22 files changed

+47
-54
lines changed

‎roles/tpa_single_node/defaults/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
# Storage Service
3-
tpa_single_node_storage_type: s3 # Either s3 or minio or other s3 compatible
3+
tpa_single_node_storage_type: minio # Either s3 or minio or other s3 compatible
44
tpa_single_node_storage_region: eu-west-1 # <AWS S3 Storage region> # For Minio just keep eu-west-1
55
# SQS_SERVICE
6-
tpa_single_node_event_bus_type: sqs # Either kafka or sqs
6+
tpa_single_node_event_bus_type: kafka # Either kafka or sqs
77
### AWS SQS fields
88
tpa_single_node_sqs_region: eu-west-1 # AWS SQS Region
99
# SSO_SERVICE
10-
tpa_single_node_oidc_type: cognito # Either Keycloak or AWS Cognito
10+
tpa_single_node_oidc_type: keycloak # Either Keycloak or AWS Cognito

‎roles/tpa_single_node/handlers/main.yml

-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
11
---
2-
- name: Reload systemd
3-
ansible.builtin.systemd_service:
4-
name: "{{ item }}"
5-
loop: "{{ services }}"
6-
7-
- name: Reboot machine
8-
ansible.builtin.reboot:
9-
msg: "Rebooting machine..."

‎roles/tpa_single_node/tasks/bombastic/api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
vars:
1212
specs:
1313
service: bombastic-api
14-
state: started
14+
state: restarted
1515
network: "{{ tpa_single_node_podman_network }}"
1616
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
1717
manifest_file: "{{ role_path }}/templates/manifests/bombastic/api/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/bombastic/indexer.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
vars:
44
specs:
55
service: bombastic-indexer
6-
state: started
6+
state: restarted
77
network: "{{ tpa_single_node_podman_network }}"
88
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
9-
manifest_file: "{{ role_path }}/templates/manifests/bombastic/api/Deployment.yaml.j2"
9+
manifest_file: "{{ role_path }}/templates/manifests/bombastic/indexer/Deployment.yaml.j2"
1010
configmaps:
1111
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"

‎roles/tpa_single_node/tasks/collector/osv.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
vars:
1919
specs:
2020
service: collector-osv
21-
state: started
21+
state: restarted
2222
network: "{{ tpa_single_node_podman_network }}"
2323
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
24-
manifest_file: "{{ role_path }}/templates/manifests/bombastic/api/Deployment.yaml.j2"
24+
manifest_file: "{{ role_path }}/templates/manifests/collector/osv/Deployment.yaml.j2"
2525
configmaps:
2626
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/collector-osv.yaml"
2727
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/collectorist-api-guac.yaml"

‎roles/tpa_single_node/tasks/collectorist/api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
vars:
3030
specs:
3131
service: collectorist-api
32-
state: started
32+
state: restarted
3333
network: "{{ tpa_single_node_podman_network }}"
3434
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
3535
manifest_file: "{{ role_path }}/templates/manifests/collectorist/api/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/dataset/init.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
vars:
55
specs:
66
service: init-dataset
7-
state: stopped
7+
state: started
88
network: "{{ tpa_single_node_podman_network }}"
99
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
1010
manifest_file: "{{ role_path }}/templates/manifests/init/dataset/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/guac/bombastic_collector.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
vars:
55
specs:
66
service: guac-collector-bombastic
7-
state: started
7+
state: restarted
88
network: "{{ tpa_single_node_podman_network }}"
99
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
1010
manifest_file: "{{ role_path }}/templates/manifests/guac/bombastic-collector/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/guac/guac_collectsub.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
vars:
55
specs:
66
service: guac-collectsub
7-
state: started
7+
state: restarted
88
network: "{{ tpa_single_node_podman_network }}"
99
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
1010
manifest_file: "{{ role_path }}/templates/manifests/guac/collectsub/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/guac/guac_graphql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
vars:
55
specs:
66
service: guac-graphql
7-
state: started
7+
state: restarted
88
network: "{{ tpa_single_node_podman_network }}"
99
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
1010
manifest_file: "{{ role_path }}/templates/manifests/guac/graphql/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/guac/vexination_collector.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
vars:
55
specs:
66
service: guac-collector-vexination
7-
state: started
7+
state: restarted
88
network: "{{ tpa_single_node_podman_network }}"
99
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
1010
manifest_file: "{{ role_path }}/templates/manifests/guac/vexination-collector/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/install_service.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
src: "{{ specs.manifest_file }}"
44
dest: "{{ tpa_single_node_kube_manifest_dir }}/Deployments/{{ specs.service }}.yaml"
55
mode: "0600"
6+
register: copy_manifest
67

78
- name: Generate {{ specs.service }} Quadlet file
89
ansible.builtin.template:
910
src: "{{ specs.kube_file }}"
1011
dest: "/etc/containers/systemd/{{ specs.service }}.kube"
1112
mode: "0600"
12-
13+
register: copy_systemd_file
14+
1315
- name: Add systemd timer for {{ specs.service }}
1416
when: specs.timer is defined
1517
ansible.builtin.template:
@@ -18,8 +20,11 @@
1820
mode: "0600"
1921
register: copy_systemd_timer_file
2022

21-
- name: Add {{ specs.service }} to services list
22-
ansible.builtin.set_fact:
23-
services: "{{ services + [ specs.service ] }}"
24-
changed_when: true
25-
notify: Reload systemd
23+
- name: Restart Podman Service for {{ specs.service }}
24+
ansible.builtin.systemd:
25+
state: "{{ specs.state }}"
26+
enabled: true
27+
daemon_reload: true
28+
name: "{{ specs.service }}"
29+
no_block: true
30+
when: copy_manifest.changed or copy_systemd_file.changed or copy_systemd_timer_file.changed

‎roles/tpa_single_node/tasks/main.yml

-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
- ansible_facts['distribution_major_version'] == '9'
1616
- (ansible_facts['distribution_version'] | split('.'))[1] | int >= 3
1717

18-
- name: Create Services list
19-
ansible.builtin.set_fact:
20-
services: []
21-
2218
- name: Install Operating System Components
2319
ansible.builtin.include_tasks: os.yml
2420
when: rhel

‎roles/tpa_single_node/tasks/spog/api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
vars:
3535
specs:
3636
service: spog-api
37-
state: started
37+
state: restarted
3838
network: "{{ tpa_single_node_podman_network }}"
3939
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
4040
manifest_file: "{{ role_path }}/templates/manifests/spog/api/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/spog/nginx.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
vars:
2525
specs:
2626
service: nginx
27-
state: started
27+
state: restarted
2828
network: "{{ tpa_single_node_podman_network }}"
2929
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
3030
manifest_file: "{{ role_path }}/templates/manifests/nginx/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/spog/ui.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
vars:
3131
specs:
3232
service: spog-ui
33-
state: started
33+
state: restarted
3434
network: "{{ tpa_single_node_podman_network }}"
3535
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
3636
manifest_file: "{{ role_path }}/templates/manifests/spog/ui/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/v11y/api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
vars:
1212
specs:
1313
service: v11y-api
14-
state: started
14+
state: restarted
1515
network: "{{ tpa_single_node_podman_network }}"
1616
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
1717
manifest_file: "{{ role_path }}/templates/manifests/v11y/api/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/v11y/indexer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
vars:
44
specs:
55
service: v11y-indexer
6-
state: started
6+
state: restarted
77
network: "{{ tpa_single_node_podman_network }}"
88
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
99
manifest_file: "{{ role_path }}/templates/manifests/v11y/indexer/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/vexination/api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
vars:
1212
specs:
1313
service: vexination-api
14-
state: started
14+
state: restarted
1515
network: "{{ tpa_single_node_podman_network }}"
1616
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
1717
manifest_file: "{{ role_path }}/templates/manifests/vexination/api/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/vexination/indexer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
vars:
44
specs:
55
service: vexination-indexer
6-
state: started
6+
state: restarted
77
network: "{{ tpa_single_node_podman_network }}"
88
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
99
manifest_file: "{{ role_path }}/templates/manifests/vexination/indexer/Deployment.yaml.j2"

‎roles/tpa_single_node/tasks/vexination/walker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
state: stopped
99
network: "{{ tpa_single_node_podman_network }}"
1010
kube_file: "{{ role_path }}/templates/systemd/default.kube.j2"
11-
manifest_file: "{{ role_path }}/templates/manifests/vexination/walker//Deployment.yaml.j2"
11+
manifest_file: "{{ role_path }}/templates/manifests/vexination/walker/Deployment.yaml.j2"
1212
configmaps:
1313
- "{{ tpa_single_node_kube_manifest_dir }}/ConfigMaps/custom-trust-anchor.yaml"
1414
timer:

‎roles/tpa_single_node/vars/main.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,38 @@ tpa_single_node_systemd_directory: /etc/systemd/system
1010
tpa_single_node_default_empty: ""
1111

1212
# DB_SERVICE
13-
tpa_single_node_pg_install_enabled: true
13+
tpa_single_node_pg_install_enabled: false
1414
tpa_single_node_pg_host: "{{ lookup('env', 'TPA_PG_HOST') | default('192.168.121.60', true) }}"
1515
tpa_single_node_pg_port: 5432
1616
tpa_single_node_pg_db: guac
1717
tpa_single_node_pg_admin: "{{ lookup('env', 'TPA_PG_ADMIN') }}"
1818
tpa_single_node_pg_admin_passwd: "{{ lookup('env', 'TPA_PG_ADMIN_PASSWORD') }}"
1919
tpa_single_node_pg_user: "{{ lookup('env', 'TPA_PG_USER') }}"
2020
tpa_single_node_pg_user_passwd: "{{ lookup('env', 'TPA_PG_USER_PASSWORD') }}"
21-
tpa_single_node_pg_ssl_mode: disable
21+
tpa_single_node_pg_ssl_mode: require
2222

2323
# Storage Service
2424
tpa_single_node_storage_access_key: "{{ lookup('env', 'TPA_STORAGE_ACCESS_KEY') }}" # S3/minio root username
2525
tpa_single_node_storage_secret_key: "{{ lookup('env', 'TPA_STORAGE_SECRET_KEY') }}" # S3/minio root password
26-
tpa_single_node_storage_bombastic_bucket: bombastic-rhtpa # <bombastic storage bucket name>
27-
tpa_single_node_storage_v11y_bucket: v11y-rhtpa # <v11y storage bucket name>
28-
tpa_single_node_storage_vexination_bucket: vexination-rhtpa # <vexination storage bucket name>
26+
tpa_single_node_storage_bombastic_bucket: bombastic-default # <bombastic storage bucket name>
27+
tpa_single_node_storage_v11y_bucket: v11y-default # <v11y storage bucket name>
28+
tpa_single_node_storage_vexination_bucket: vexination-default # <vexination storage bucket name>
2929

3030
## Storage Service - Minio fields
3131
tpa_single_node_storage_endpoint: "{{ lookup('env', 'TPA_STORAGE_ENDPOINT') }}" # Minio storage URL pointing to API 9000
3232

3333
# SQS_SERVICE
3434
tpa_single_node_event_access_key_id: "{{ lookup('env', 'TPA_EVENT_ACCESS_KEY_ID') }}" # Kafka Username or AWS SQS Access Key ID
3535
tpa_single_node_event_secret_access_key: "{{ lookup('env', 'TPA_EVENT_SECRET_ACCESS_KEY') }}" # Kafka password or AWS SQS Secret Access Key
36-
tpa_single_node_bombastic_topic_failed: bombastic-failed-rhtpa # Bombastic Events topic failed
37-
tpa_single_node_bombastic_topic_indexed: bombastic-indexed-rhtpa # Bombastic Events topic indexed
38-
tpa_single_node_bombastic_topic_stored: bombastic-stored-rhtpa # Bombastic Events topic stored
39-
tpa_single_node_vexination_topic_failed: vexination-failed-rhtpa # Vexination Events topic failed
40-
tpa_single_node_vexination_topic_indexed: vexination-indexed-rhtpa # Vexination Events topic indexed
41-
tpa_single_node_vexination_topic_stored: vexination-stored-rhtpa # Vexination Events topic stored
42-
tpa_single_node_v11y_topic_failed: v11y-failed-rhtpa # v11y Events topic failed
43-
tpa_single_node_v11y_topic_indexed: v11y-indexed-rhtpa # v11y Events topic indexed
44-
tpa_single_node_v11y_topic_stored: v11y-stored-rhtpa # v11y Events topic stored
36+
tpa_single_node_bombastic_topic_failed: bombastic-failed-default # Bombastic Events topic failed
37+
tpa_single_node_bombastic_topic_indexed: bombastic-indexed-default # Bombastic Events topic indexed
38+
tpa_single_node_bombastic_topic_stored: bombastic-stored-default # Bombastic Events topic stored
39+
tpa_single_node_vexination_topic_failed: vexination-failed-default # Vexination Events topic failed
40+
tpa_single_node_vexination_topic_indexed: vexination-indexed-default # Vexination Events topic indexed
41+
tpa_single_node_vexination_topic_stored: vexination-stored-default # Vexination Events topic stored
42+
tpa_single_node_v11y_topic_failed: v11y-failed-default # v11y Events topic failed
43+
tpa_single_node_v11y_topic_indexed: v11y-indexed-default # v11y Events topic indexed
44+
tpa_single_node_v11y_topic_stored: v11y-stored-default # v11y Events topic stored
4545

4646
## SQS_SERVICE - Kafka fields
4747
tpa_single_node_kafka_bootstrap_servers: "{{ lookup('env', 'TPA_EVENT_BOOTSTRAP_SERVER') | default('tpa_single_node_default_empty', true) }}"

0 commit comments

Comments
 (0)