Merge "Do no recreate fernet tokens on setup"

2020-08-07 19:21:17 +00:00
parent 8c3988682a 8957bacb4a
commit 4f1e1329ad
1 changed files with 2 additions and 2 deletions
--- a/keystone/templates/bin/_fernet-manage.py.tpl
+++ b/keystone/templates/bin/_fernet-manage.py.tpl
@@ -150,9 +150,9 @@ def main():
                 FERNET_DIR)
        write_to_files(secret['data'])

-    if args.command == 'credential_setup':
+    if args.command in ('credential_setup', 'fernet_setup'):
        if secret.get('data', False):
-            LOG.info('Credential keys already exist, skipping setup...')
+            LOG.info('Keys already exist, skipping setup...')
            sys.exit(0)

    execute_command(args.command)