From 983bee4f95bf524fee9c0b9f87ec105d005eca96 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 22 Jan 2020 08:42:57 +0100 Subject: [PATCH] Change fetch_fernet_tokens.py behaviour to check for minimum number of tokens Change is required to properly implement logic in fernet-node-sync.sh on kolla-ansible side - to add a check if fernet key store is populated with required number of tokens. Change-Id: I51ed61e34a1dd79532b4528e56a9cd9011d46e6d Related-Bug: #1846789 (cherry picked from commit 267cb8b14ae8472d00e09c2b5e35bda7de2de54f) --- docker/keystone/keystone-fernet/fetch_fernet_tokens.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py b/docker/keystone/keystone-fernet/fetch_fernet_tokens.py index 0f739e9bf8..0c7e13e76b 100644 --- a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py +++ b/docker/keystone/keystone-fernet/fetch_fernet_tokens.py @@ -48,7 +48,7 @@ def num_tokens(): def tokens_populated(expected): - return num_tokens() == int(expected) + return num_tokens() >= int(expected) def token_stale(seconds, filename='0'): @@ -71,7 +71,7 @@ def main(): help='Filename of token to check', default='0') parser.add_argument('-n', '--number', - help='Number of tokens that should exist', + help='Minimum number of tokens that should exist', required=True) args = parser.parse_args()