From 8c057ad76fec0886a2927aeb55d9571e41512f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Knecht?= <benoit.knecht@fsfe.org>
Date: Mon, 14 Jan 2019 14:17:40 +0100
Subject: [PATCH] Set DynamicUser in systemd-journal-upload unit file

At least on Ubuntu 18.04, the `systemd-journal-remote` doesn't create
the `systemd-journal-upload` user, since the service is supposed to run
with `DynamicUser=True`.

This commit ensures that `DynamicUser` and `StateDirectory` are set
appropriately on all Systemd versions that support them (i.e. >= 235).

It requires https://review.openstack.org/#/c/630664/ to be merged first.

Change-Id: I743e936df9e69ef5532b7ec69e29057d4f1f8ef2
Closes-Bug: 1805847
---
 playbooks/infra-journal-remote.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/playbooks/infra-journal-remote.yml b/playbooks/infra-journal-remote.yml
index 5be946df31..9dd7b6756c 100644
--- a/playbooks/infra-journal-remote.yml
+++ b/playbooks/infra-journal-remote.yml
@@ -122,6 +122,8 @@
             --save-state
             --merge
             --url=http://{{ systemd_journal_remote_target }}:19532
+          dynamic_user: true
+          state_directory: systemd/journal-upload
 
   vars:
     systemd_journal_remote_target: "{{ hostvars[groups['log_hosts'][0]]['ansible_host'] }}"