From 07d42bff01c811daf6e19b4c4984950243613157 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 9 Oct 2020 12:25:40 +0200
Subject: [PATCH] Fix fernet cron path on Ubuntu/Debian
The correct path according to Ubuntu cron manpage [1] is
/var/spool/cron/crontabs/$USER
[1]: http://manpages.ubuntu.com/manpages/trusty/man8/cron.8.html
Closes-Bug: #1898765
Change-Id: Id5fc354e3e32cae2468cd2557a2967859e3b4e16
---
ansible/roles/keystone/templates/keystone-fernet.json.j2 | 2 +-
releasenotes/notes/bug-1898765-73881932a2ef1d32.yaml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 releasenotes/notes/bug-1898765-73881932a2ef1d32.yaml
diff --git a/ansible/roles/keystone/templates/keystone-fernet.json.j2 b/ansible/roles/keystone/templates/keystone-fernet.json.j2
index 05fa9cda53..10890eb7e6 100644
--- a/ansible/roles/keystone/templates/keystone-fernet.json.j2
+++ b/ansible/roles/keystone/templates/keystone-fernet.json.j2
@@ -1,5 +1,5 @@
{% set cron_cmd = 'cron -f' if kolla_base_distro in ['ubuntu', 'debian'] else 'crond -s -n' %}
-{% set cron_path = '/var/spool/cron/crontabs/root/fernet-cron' if kolla_base_distro in ['ubuntu', 'debian'] else '/var/spool/cron/root' %}
+{% set cron_path = '/var/spool/cron/crontabs/root' if kolla_base_distro in ['ubuntu', 'debian'] else '/var/spool/cron/root' %}
{
"command": "{{ cron_cmd }}",
"config_files": [{
diff --git a/releasenotes/notes/bug-1898765-73881932a2ef1d32.yaml b/releasenotes/notes/bug-1898765-73881932a2ef1d32.yaml
new file mode 100644
index 0000000000..ba8d3aebe2
--- /dev/null
+++ b/releasenotes/notes/bug-1898765-73881932a2ef1d32.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+ - |
+ Fixed invalid fernet cron file path on Debian/Ubuntu from
+ ``/var/spool/cron/crontabs/root/fernet-cron`` to
+ ``/var/spool/cron/crontabs/root``.
+ `LP#1898765 <https://bugs.launchpad.net/kolla-ansible/+bug/1898765>`__