From 4b6372572c7ff4f7a6aed9de5cb91780205fcbb7 Mon Sep 17 00:00:00 2001 From: MKLeb Date: Wed, 30 Nov 2022 21:32:55 -0500 Subject: [PATCH] Add changelog and fix unformatted text table in vault pillar module docstring --- changelog/61821.fixed | 1 + salt/pillar/vault.py | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 changelog/61821.fixed diff --git a/changelog/61821.fixed b/changelog/61821.fixed new file mode 100644 index 00000000000..6ff1221f543 --- /dev/null +++ b/changelog/61821.fixed @@ -0,0 +1 @@ +When deleting the vault cache, also delete from the session cache diff --git a/salt/pillar/vault.py b/salt/pillar/vault.py index bbd9fcab89a..032af149bd3 100644 --- a/salt/pillar/vault.py +++ b/salt/pillar/vault.py @@ -74,23 +74,25 @@ You can also use nesting here as well. Identical nesting keys will get merged. The difference between the return with and without the nesting key is shown below. This example takes the key value pairs returned from vault as follows: -path=secret/salt +.. code-block:: text -Key Value ---- ----- -salt-passwd badpasswd1 + path=secret/salt -path=secret/root + Key Value + --- ----- + salt-passwd badpasswd1 -Key Value ---- ----- -root-passwd rootbadpasswd1 + path=secret/root -path=secret/minions/{minion}/pass + Key Value + --- ----- + root-passwd rootbadpasswd1 -Key Value ---- ----- -minion-passwd minionbadpasswd1 + path=secret/minions/{minion}/pass + + Key Value + --- ----- + minion-passwd minionbadpasswd1 .. code-block:: yaml