From 5104ab0d0495dad990e8fc5751647faceb2d4e8c Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Thu, 6 Jun 2019 15:02:15 +0000
Subject: [PATCH] bodhi: Use the new way to configure systemd units

systemd has been emitting a warning about how the include
directive is deprecated. This commit switches Bodhi's systemd
override unit file to use the new way.

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
---
 roles/bodhi2/backend/files/fm-consumer@.service |  2 --
 roles/bodhi2/backend/tasks/main.yml             | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/roles/bodhi2/backend/files/fm-consumer@.service b/roles/bodhi2/backend/files/fm-consumer@.service
index 31fa2852a9..918ba5a00b 100644
--- a/roles/bodhi2/backend/files/fm-consumer@.service
+++ b/roles/bodhi2/backend/files/fm-consumer@.service
@@ -1,5 +1,3 @@
-.include /usr/lib/systemd/system/fm-consumer@.service
-
 [Service]
 User = apache
 Group = apache
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 655081c9ce..0b67239d47 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -247,10 +247,21 @@
   tags:
   - bodhi
 
+- name: Create /etc/systemd/system/fm-consumer@.service.d
+  file:
+    state: directory
+    path: /etc/systemd/system/fm-consumer@.service.d
+    owner: root
+    group: root
+    mode: 0755
+  tags:
+  - bodhi
+  - config
+
 - name: Configure fm-consumer@.service to run as apache
   copy:
     src: fm-consumer@.service
-    dest: /etc/systemd/system/fm-consumer@.service
+    dest: /etc/systemd/system/fm-consumer@.service.d/local.conf
     owner: root
     group: root
     mode: 0644