From 6e5189646feb224d1b4f546fbe04df28c4f0e240 Mon Sep 17 00:00:00 2001 From: Bas de Bruijne Date: Tue, 6 Dec 2022 14:40:50 -0400 Subject: [PATCH] Use juju-exec in chron jobs for juju3 support Change-Id: Id2a92a134c2e663b3dca10dbc36dd7c7afc9c86b --- templates/keystone-fernet-rotate-sync | 4 ++-- tox.ini | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/keystone-fernet-rotate-sync b/templates/keystone-fernet-rotate-sync index 184c0e88..d118e1ab 100644 --- a/templates/keystone-fernet-rotate-sync +++ b/templates/keystone-fernet-rotate-sync @@ -2,8 +2,8 @@ # works out when to do the rotate and sync of the keys. {% if enabled -%} {% if use_syslog -%} -{{ minute }} * * * * root /usr/bin/juju-run {{ unit_name }} {{ charm_dir }}/scripts/fernet_rotate_and_sync.py 2>&1 | logger -t keystone-fernet-rotate-sync +{{ minute }} * * * * root $(which /usr/bin/juju-exec || which /usr/bin/juju-run) {{ unit_name }} {{ charm_dir }}/scripts/fernet_rotate_and_sync.py 2>&1 | logger -t keystone-fernet-rotate-sync {% else -%} -{{ minute }} * * * * root /usr/bin/juju-run {{ unit_name }} {{ charm_dir }}/scripts/fernet_rotate_and_sync.py >> /var/log/keystone/keystone-fernet-rotate-sync.log 2>&1 +{{ minute }} * * * * root $(which /usr/bin/juju-exec || which /usr/bin/juju-run) {{ unit_name }} {{ charm_dir }}/scripts/fernet_rotate_and_sync.py >> /var/log/keystone/keystone-fernet-rotate-sync.log 2>&1 {% endif -%} {% endif -%} diff --git a/tox.ini b/tox.ini index bddbd1f2..c73ceb05 100644 --- a/tox.ini +++ b/tox.ini @@ -26,6 +26,7 @@ requires = pip < 20.3 virtualenv < 20.0 setuptools < 50.0.0 + tox < 4.0.0 # NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci minversion = 3.18.0