Skip to content

Commit

Permalink
Regroup pod restart
Browse files Browse the repository at this point in the history
  • Loading branch information
gildub committed Oct 28, 2024
1 parent ee4e968 commit 66fabbf
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 30 deletions.
6 changes: 3 additions & 3 deletions roles/tpa_single_node/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
# Storage Service
tpa_single_node_storage_type: s3 # Either s3 or minio or other s3 compatible
tpa_single_node_storage_type: minio # Either s3 or minio or other s3 compatible
tpa_single_node_storage_region: eu-west-1 # <AWS S3 Storage region> # For Minio just keep eu-west-1
# SQS_SERVICE
tpa_single_node_event_bus_type: sqs # Either kafka or sqs
tpa_single_node_event_bus_type: kafka # Either kafka or sqs
### AWS SQS fields
tpa_single_node_sqs_region: eu-west-1 # AWS SQS Region
# SSO_SERVICE
tpa_single_node_oidc_type: cognito # Either Keycloak or AWS Cognito
tpa_single_node_oidc_type: keycloak # Either Keycloak or AWS Cognito
4 changes: 4 additions & 0 deletions roles/tpa_single_node/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
---
- name: Reload systemd
ansible.builtin.systemd_service:
name: "{{ item }}"
loop: "{{ services }}"
13 changes: 5 additions & 8 deletions roles/tpa_single_node/tasks/install_manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,8 @@
mode: "0600"
register: copy_systemd_file

- name: Restart Podman Service
ansible.builtin.systemd:
state: restarted
enabled: true
daemon_reload: true
name: "{{ podman_spec.systemd_file }}"
no_block: true
when: copy_manifest.changed or copy_systemd_file.changed
- name: Add {{ podman_spec.systemd_file }} to services list
ansible.builtin.set_fact:
services: "{{ services + [ podman_spec.systemd_file ] }}"

Check warning on line 27 in roles/tpa_single_node/tasks/install_manifest.yml

View workflow job for this annotation

GitHub Actions / ansible-lint

jinja[spacing]

Jinja2 spacing could be improved: {{ services + [ podman_spec.systemd_file ] }} -> {{ services + \[podman_spec.systemd_file] }}
changed_when: true
notify: Reload systemd
22 changes: 5 additions & 17 deletions roles/tpa_single_node/tasks/install_manifest_cronjob.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,8 @@
mode: "0600"
register: copy_systemd_timer_file

- name: Restart Podman Service
ansible.builtin.systemd:
state: started
enabled: true
daemon_reload: false
name: "{{ podman_spec.systemd_file }}"
no_block: true
when: copy_manifest.changed or copy_systemd_file.changed

- name: Restart Timer Podman Service
ansible.builtin.systemd:
state: started
enabled: true
daemon_reload: false
name: "{{ podman_spec.systemd_file }}.timer"
no_block: true
when: copy_manifest.changed or copy_systemd_timer_file.changed
- name: Add {{ podman_spec.systemd_file }} to services list
ansible.builtin.set_fact:
services: "{{ services + [ podman_spec.systemd_file ] }}"

Check warning on line 32 in roles/tpa_single_node/tasks/install_manifest_cronjob.yml

View workflow job for this annotation

GitHub Actions / ansible-lint

jinja[spacing]

Jinja2 spacing could be improved: {{ services + [ podman_spec.systemd_file ] }} -> {{ services + \[podman_spec.systemd_file] }}
changed_when: true
notify: Reload systemd
4 changes: 4 additions & 0 deletions roles/tpa_single_node/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
- ansible_facts['distribution_major_version'] == '9'
- (ansible_facts['distribution_version'] | split('.'))[1] | int >= 3

- name: Create Services list
ansible.builtin.set_fact:
services: []

- name: Install Operating System Components
ansible.builtin.include_tasks: os.yml
when: rhel
Expand Down
4 changes: 2 additions & 2 deletions roles/tpa_single_node/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ tpa_single_node_systemd_directory: /etc/systemd/system
tpa_single_node_default_empty: ""

# DB_SERVICE
tpa_single_node_pg_install_enabled: true
tpa_single_node_pg_install_enabled: false
tpa_single_node_pg_host: "{{ lookup('env', 'TPA_PG_HOST') | default('192.168.121.60', true) }}"
tpa_single_node_pg_port: 5432
tpa_single_node_pg_db: guac
tpa_single_node_pg_admin: "{{ lookup('env', 'TPA_PG_ADMIN') }}"
tpa_single_node_pg_admin_passwd: "{{ lookup('env', 'TPA_PG_ADMIN_PASSWORD') }}"
tpa_single_node_pg_user: "{{ lookup('env', 'TPA_PG_USER') }}"
tpa_single_node_pg_user_passwd: "{{ lookup('env', 'TPA_PG_USER_PASSWORD') }}"
tpa_single_node_pg_ssl_mode: disable
tpa_single_node_pg_ssl_mode: require

# Storage Service
tpa_single_node_storage_access_key: "{{ lookup('env', 'TPA_STORAGE_ACCESS_KEY') }}" # S3/minio root username
Expand Down

0 comments on commit 66fabbf

Please sign in to comment.