From 67c7186a2e89a9359bb2b0467a20be9c185165d7 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Thu, 6 Aug 2020 09:30:52 +0200
Subject: [PATCH] ODCS: Move systemd daemon_reload to separate task to
 hopefully fix the disabled odcs-celery-backend service.

---
 roles/odcs/base/tasks/main.yml | 48 +++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/roles/odcs/base/tasks/main.yml b/roles/odcs/base/tasks/main.yml
index ef55980ee1..ad72e7122a 100644
--- a/roles/odcs/base/tasks/main.yml
+++ b/roles/odcs/base/tasks/main.yml
@@ -221,16 +221,6 @@
   - odcs
   - odcs/backend
 
-- name: enable ODCS backend (odcs-celery-backend)
-  systemd:
-    name: odcs-celery-backend
-    enabled: yes
-    daemon_reload: yes
-  when: inventory_hostname.startswith('odcs-backend')
-  tags:
-  - odcs
-  - odcs/backend
-
 - name: copy the odcs-celery-beat.service file.
   template:
     src: "etc/systemd/system/odcs-celery-beat.service.j2"
@@ -245,7 +235,33 @@
   - odcs
   - odcs/frontend
 
-- name: copy the odcs-celery-beat.service file.
+- name: Reload systemd daemon
+  systemd:
+    daemon_reload: yes
+  tags:
+  - odcs
+  - odcs/backend
+  - odcs/frontend
+
+- name: enable ODCS backend (odcs-celery-backend)
+  systemd:
+    name: odcs-celery-backend
+    enabled: yes
+  when: inventory_hostname.startswith('odcs-backend')
+  tags:
+  - odcs
+  - odcs/backend
+
+- name: enable ODCS beat (odcs-celery-beat)
+  systemd:
+    name: odcs-celery-beat
+    enabled: yes
+  when: inventory_hostname.startswith('odcs-frontend')
+  tags:
+  - odcs
+  - odcs/frontend
+
+- name: copy the fedora-messaging.toml.j2 file.
   template:
     src: "fedora-messaging.toml.j2"
     dest: /etc/fedora-messaging/config.toml
@@ -257,16 +273,6 @@
   - odcs/frontend
   - odcs/backend
 
-- name: enable ODCS beat (odcs-celery-beat)
-  systemd:
-    name: odcs-celery-beat
-    enabled: yes
-    daemon_reload: yes
-  when: inventory_hostname.startswith('odcs-frontend')
-  tags:
-  - odcs
-  - odcs/frontend
-
 - name: copy the odcs-backend.conf tmpfiles.d file.
   copy:
     src: "{{ roles_path }}/odcs/base/files/tmpfiles.d/odcs-backend.conf"