ansible: Add adminapisync service

NixFey · NixFey · commit a65815421732 · 2025-02-17T08:08:30.000-05:00
diff --git a/infrastructure/ansible/.gitignore b/infrastructure/ansible/.gitignore
@@ -1 +1,2 @@
-runPlaybook.sh
+runPlaybook.sh
+secrets.yml
diff --git a/infrastructure/ansible/main.yml b/infrastructure/ansible/main.yml
@@ -17,5 +17,14 @@
   hosts: job_runner
   become: yes
   become_method: sudo
+  vars_files: './secrets.yml'
   roles:
-    - job-runner
+    - role: fim-queueing-sync
+      healthCheckEnabled: '{{ fimqueueing.healthCheckEnabled }}'
+      healthCheckUrl: '{{ fimqueueing.healthCheckUrl }}'
+    - role: fimadminapi-sync
+      syncUrl: '{{ fimadminapi.syncUrl }}'
+      syncToken: '{{ fimadminapi.syncToken }}'
+      healthCheckEnabled: '{{ fimadminapi.healthCheckEnabled }}'
+      healthCheckUrl: '{{ fimadminapi.healthCheckUrl }}'
+      
diff --git a/infrastructure/ansible/roles/fim-queueing-sync/defaults/main.yml b/infrastructure/ansible/roles/fim-queueing-sync/defaults/main.yml
diff --git a/infrastructure/ansible/roles/fim-queueing-sync/tasks/main.yml b/infrastructure/ansible/roles/fim-queueing-sync/tasks/main.yml
@@ -1,15 +1,22 @@
 # Set up a fim-job-runner machine
 
 - name: Copy .service file to instance
+  register: service_file
   template: 
     src: fim-updateCurrentMatch.service.j2
     dest: /etc/systemd/system/fim-updateCurrentMatch.service
 
 - name: Copy .timer file to instance
+  register: timer_file
   template:
     src: fim-updateCurrentMatch.timer.j2
     dest: /etc/systemd/system/fim-updateCurrentMatch.timer
 
+- name: daemon-reload
+  systemd_service:
+    daemon_reload: yes
+  when: service_file.changed or timer_file.changed
+
 - name: Ensure timer is started
   service:
     name: fim-updateCurrentMatch.timer
diff --git a/infrastructure/ansible/roles/fim-queueing-sync/templates/fim-updateCurrentMatch.service.j2 b/infrastructure/ansible/roles/fim-queueing-sync/templates/fim-updateCurrentMatch.service.j2
diff --git a/infrastructure/ansible/roles/fim-queueing-sync/templates/fim-updateCurrentMatch.timer.j2 b/infrastructure/ansible/roles/fim-queueing-sync/templates/fim-updateCurrentMatch.timer.j2
diff --git a/infrastructure/ansible/roles/fimadminapi-sync/defaults/main.yml b/infrastructure/ansible/roles/fimadminapi-sync/defaults/main.yml
@@ -0,0 +1,5 @@
+healthCheckEnabled: false
+healthCheckUrl: ""
+intervalSec: 10
+syncUrl: ""
+syncToken: ""
diff --git a/infrastructure/ansible/roles/fimadminapi-sync/tasks/main.yml b/infrastructure/ansible/roles/fimadminapi-sync/tasks/main.yml
@@ -0,0 +1,23 @@
+# Set up a fim-job-runner machine
+
+- name: Copy .service file to instance
+  register: service_file
+  template: 
+    src: fim-adminapisync.service.j2
+    dest: /etc/systemd/system/fim-adminapisync.service
+
+- name: Copy .timer file to instance
+  register: timer_file
+  template:
+    src: fim-adminapisync.timer.j2
+    dest: /etc/systemd/system/fim-adminapisync.timer
+
+- name: daemon-reload
+  systemd_service:
+    daemon_reload: yes
+  when: service_file.changed or timer_file.changed
+
+- name: Ensure timer is started
+  service:
+    name: fim-adminapisync.timer
+    active: true
diff --git a/infrastructure/ansible/roles/fimadminapi-sync/templates/fim-adminapisync.service.j2 b/infrastructure/ansible/roles/fimadminapi-sync/templates/fim-adminapisync.service.j2
@@ -0,0 +1,12 @@
+[Unit]
+Description=Run sync current events process in FiMAdminApi
+After=network.target
+StartLimitIntervalSec=5
+StartLimitBurst=2
+
+[Service]
+Type=simple
+User=root
+ExecStart=/usr/bin/env curl -H 'X-fim-sync-secret: {{ syncToken }}' --request PUT {{ syncUrl }}
+# Optionally, send a ping to a health check for alerting if the service stops running
+{% if not healthCheckEnabled or healthCheckUrl == "" %}# {% endif %}ExecStartPost=/usr/bin/env curl -fsS -m 10 --retry 5 -o /dev/null {{ healthCheckUrl or "<<Health Check URL>>" }}
diff --git a/infrastructure/ansible/roles/fimadminapi-sync/templates/fim-adminapisync.timer.j2 b/infrastructure/ansible/roles/fimadminapi-sync/templates/fim-adminapisync.timer.j2
@@ -0,0 +1,7 @@
+[Timer]
+OnUnitInactiveSec={{ intervalSec }}s
+OnBootSec={{ intervalSec }}s
+Unit=fim-adminapisync.service
+
+[Install]
+WantedBy=multi-user.target

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-runPlaybook.sh`
	`1`	`+runPlaybook.sh`
	`2`	`+secrets.yml`