From 4106fef31f3061f290a7bf011f85fe36c367dec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= <cjeanner@redhat.com>
Date: Tue, 8 Nov 2022 15:50:29 +0100
Subject: [PATCH] Move cryprography pin

This moves the cryptography pin to ansible-requirements.txt
which is used as a constraints file[1].

[1] https://opendev.org/openstack/tripleo-ansible/src/branch/master/zuul.d/playbooks/pre.yml#L42

Related-Bug: #1995608
Change-Id: I646cd49b614a9f494e77f9893521d3c070900ed5
(cherry picked from commit c0bc395ab494ee18e77fba608cdd40762c7b8c51)
---
 ansible-requirements.txt                                       | 1 +
 molecule-requirements.txt                                      | 2 +-
 tox.ini                                                        | 3 ++-
 .../molecule/default/start_keystone.sh                         | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ansible-requirements.txt b/ansible-requirements.txt
index ea2c37a1b..ccc2856a7 100644
--- a/ansible-requirements.txt
+++ b/ansible-requirements.txt
@@ -1,4 +1,5 @@
 ansible-core<2.12.0
+cryptography<37.0.0
 metalsmith>=1.4.0 # Apache-2.0
 importlib-metadata
 jsonschema  # MIT
diff --git a/molecule-requirements.txt b/molecule-requirements.txt
index 942fdf7a8..27d27a522 100644
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@@ -14,7 +14,7 @@ ruamel.yaml
 testinfra
 netaddr
 jinja2
-cryptography<37.0.0
+cryptography
 
 # this is required for the docs build jobs
 ansible-core<2.12.0
diff --git a/tox.ini b/tox.ini
index 8fa6c4099..713e19a98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -96,7 +96,8 @@ sitepackages = False
 [testenv:role-addition]
 basepython = python3
 deps =
-   {[testenv:linters]deps}
+   pre-commit
+   virtualenv
    -r {toxinidir}/molecule-requirements.txt
    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
 commands =
diff --git a/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/start_keystone.sh b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/start_keystone.sh
index a6b618dd2..2d3381787 100755
--- a/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/start_keystone.sh
+++ b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/start_keystone.sh
@@ -3,7 +3,6 @@ set -x
 
 ### Openstack Keystone
 
-: ${OS_RELEASE:=queens}
 : ${IPADDR:=127.0.0.1}
 # Identity service configuration
 : ${OS_IDENTITY_URL_IPADDR:=$IPADDR}