diff --git a/ansible-requirements.txt b/ansible-requirements.txt index 942ef3a5d..5e18bf795 100644 --- a/ansible-requirements.txt +++ b/ansible-requirements.txt @@ -1,2 +1,3 @@ ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0 importlib-metadata<2.0.0 +cryptography<37.0.0 diff --git a/molecule-requirements.txt b/molecule-requirements.txt index 1715f0b72..6c76be6d2 100644 --- a/molecule-requirements.txt +++ b/molecule-requirements.txt @@ -11,6 +11,7 @@ sh>=1.12.14,<1.13 molecule==3.0a5 netaddr jinja2>=2.8.0,<3 +cryptography # this is required for the docs build jobs ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0 diff --git a/tox.ini b/tox.ini index 97743eb0f..6aaf18437 100644 --- a/tox.ini +++ b/tox.ini @@ -103,6 +103,7 @@ commands = {posargs} [testenv:role-addition] deps= {[testenv:linters]deps} + -r {toxinidir}/molecule-requirements.txt commands = bash -c "ansible-playbook -i localhost, role-addition.yml -e role_name=skeleton_test" bash -c "if podman ps 2> /dev/null; then \ 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}