From fdc57405aac6b37c01ab51d64c5ce565c7f84423 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Sat, 27 Sep 2025 12:34:15 +0200 Subject: requirements: pin bcrypt to supported version Disabling requirements check because we need to pin bcrypt to a version lower than 5.0.0, due to passlib and bcrypt incompatibility, and since passlib is basically dead - there's no way to fix that in any other way for stable branches. Related issue: https://github.com/ansible/ansible/issues/85919 Closes-Bug: #2126975 Closes-Bug: #2102117 Signed-off-by: Christian Berendt Signed-off-by: Joachim de Groot Change-Id: I47eee02a47104d3411992f7e6e9dd8f0c2ad0919 --- .../work-around-incompatible-bcypt-version-e5dc29e13a1b313e.yaml | 5 +++++ requirements.txt | 2 +- zuul.d/project.yaml | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/work-around-incompatible-bcypt-version-e5dc29e13a1b313e.yaml diff --git a/releasenotes/notes/work-around-incompatible-bcypt-version-e5dc29e13a1b313e.yaml b/releasenotes/notes/work-around-incompatible-bcypt-version-e5dc29e13a1b313e.yaml new file mode 100644 index 000000000..4f12c5ef0 --- /dev/null +++ b/releasenotes/notes/work-around-incompatible-bcypt-version-e5dc29e13a1b313e.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fix generating passwords longer than 72 characters. This fixes prometheus + configuration. `LP#2126975 `__ diff --git a/requirements.txt b/requirements.txt index bf2591b8e..c3b37d328 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # Password hashing -bcrypt>=3.0.0 # Apache-2.0 +bcrypt>=4.3.0,<5 # Apache-2.0 # password generation cryptography>=2.1 # BSD/Apache-2.0 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 098624130..cebe4b88c 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -3,7 +3,8 @@ queue: kolla templates: - ansible-role-jobs - - check-requirements + # TODO(mnasiadka): Fix ansible/passlib/bcrypt 5.0.0 + #- check-requirements - kolla-ansible-scenario-aio - kolla-ansible-scenario-bifrost - kolla-ansible-scenario-cells -- cgit v1.2.3