From a83173da818e8a4b14812dd111f017b34beb6abc Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 9 Jan 2020 18:32:32 +0100 Subject: [PATCH] Adapt fetch-fernet-tokens script to Python 3 Backport: train Closes-Bug: #1859047 Change-Id: I9032e43bffa3a3de6c33a4ab59f65bafb0129dd5 (cherry picked from commit 902f16cb1a8efc44da8669a6707d93d47160ae9d) --- docker/keystone/keystone-fernet/fetch_fernet_tokens.py | 2 +- releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml diff --git a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py b/docker/keystone/keystone-fernet/fetch_fernet_tokens.py index 0c7e13e76b..4371f9c402 100644 --- a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py +++ b/docker/keystone/keystone-fernet/fetch_fernet_tokens.py @@ -43,7 +43,7 @@ def has_file(filename_path): def num_tokens(): - _, _, files = os.walk(TOKEN_PATH).next() + _, _, files = next(os.walk(TOKEN_PATH)) return len(files) diff --git a/releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml b/releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml new file mode 100644 index 0000000000..0ab49384ca --- /dev/null +++ b/releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fix bug which caused Keystone Fernet key distribution to fail on Python 3 systems, + by adapting fetch-fernet-keys.py script to work on Python 3. + `LP#1859047 `