aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-02-10 19:00:16 +0000
committerGerrit Code Review <review@openstack.org>2020-02-10 19:00:16 +0000
commita38c672ab4ac9ccbc11ffa6622a77e18a2a2d242 (patch)
tree3170a8bb5a439276877d7d1845819d4098d49927 /doc
parentc83c5b0edca39becd92ac15c010597b9c750ce18 (diff)
parented225a36d88abefc9a52100a44f7d5f8d4d8322c (diff)
downloadkolla-ansible-a38c672ab4ac9ccbc11ffa6622a77e18a2a2d242.tar.gz
kolla-ansible-a38c672ab4ac9ccbc11ffa6622a77e18a2a2d242.zip
Merge "Add --clean to kolla-mergepwd"
Diffstat (limited to 'doc')
-rw-r--r--doc/source/user/operating-kolla.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/source/user/operating-kolla.rst b/doc/source/user/operating-kolla.rst
index 18f946590..5cb6ff0f1 100644
--- a/doc/source/user/operating-kolla.rst
+++ b/doc/source/user/operating-kolla.rst
@@ -217,3 +217,8 @@ For example:
kolla-genpwd -p passwords.yml.new
kolla-mergepwd --old passwords.yml.old --new passwords.yml.new --final /etc/kolla/passwords.yml
+.. note::
+
+ ``kolla-mergepwd``, by default, keeps old, unused passwords intact.
+ To alter this behavior, and remove such entries, use the ``--clean``
+ argument when invoking ``kolla-mergepwd``.