openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Fix fernet cron path on Ubuntu/Debian"

This commit is contained in:
Zuul 2020-10-22 08:13:00 +00:00 committed by Gerrit Code Review
parent 9dfedd107d 07d42bff01
commit 8bc37f5282
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/keystone/templates/keystone-fernet.json.j2
View File

@ -1,5 +1,5 @@
{% set cron_cmd = 'cron -f' if kolla_base_distro in ['ubuntu', 'debian'] else 'crond -s -n' %} {% 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 }}", "command": "{{ cron_cmd }}",
"config_files": [{ "config_files": [{

7
releasenotes/notes/bug-1898765-73881932a2ef1d32.yaml Normal file
View File

@ -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>`__