summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2020-01-09 18:32:32 +0100
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-03-06 17:47:34 +0000
commita83173da818e8a4b14812dd111f017b34beb6abc (patch)
tree8547be35e92e807d68597a96ac2b944083d41d1c
parentd53ead9421a288137fba8e20b22844d1cdce6506 (diff)
downloadkolla-a83173da818e8a4b14812dd111f017b34beb6abc.tar.gz
kolla-a83173da818e8a4b14812dd111f017b34beb6abc.zip
Adapt fetch-fernet-tokens script to Python 3
Backport: train Closes-Bug: #1859047 Change-Id: I9032e43bffa3a3de6c33a4ab59f65bafb0129dd5 (cherry picked from commit 902f16cb1a8efc44da8669a6707d93d47160ae9d)
-rw-r--r--docker/keystone/keystone-fernet/fetch_fernet_tokens.py2
-rw-r--r--releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml6
2 files changed, 7 insertions, 1 deletions
diff --git a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py b/docker/keystone/keystone-fernet/fetch_fernet_tokens.py
index 0c7e13e76..4371f9c40 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 000000000..0ab49384c
--- /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 <https://launchpad.net/bugs/1859047>`