diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-14 10:31:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-14 10:31:08 +0000 |
| commit | 440691eaa087855e8151dd1013c34907d9f8c7f3 (patch) | |
| tree | bacfda6957c7e40919cb453ca153db2e9901ddd9 | |
| parent | 0fdf6564276ec115458560e33fa3b19a862e27a6 (diff) | |
| parent | f284b6852f0036f845130ab4f9ae11cf902aad2f (diff) | |
| download | kolla-440691eaa087855e8151dd1013c34907d9f8c7f3.tar.gz kolla-440691eaa087855e8151dd1013c34907d9f8c7f3.zip | |
Merge "Adapt fetch-fernet-tokens script to Python 3"
| -rw-r--r-- | docker/keystone/keystone-fernet/fetch_fernet_tokens.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml | 6 |
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 0f739e9bf..18a3defa7 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>` |