Adjust hack to only consider OSX with Anible 2.9. (#59)
parent
06891337d1
commit
68d56c7709
|
@ -64,10 +64,10 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# START: HACK
|
# START: HACK
|
||||||
if [ "${script}" == "osx" ]; then
|
if [ "${script}" == "osx" ] && [ "${ansible_version}" == "2.9" ]; then
|
||||||
# Make sure that the latest versions of pyOpenSSL and cryptography will be installed on macOS before
|
# Make sure that the latest versions of pyOpenSSL and cryptography will be installed on macOS before
|
||||||
# ansible-playbook is started. This is necessary until https://github.com/ansible/ansible/issues/68701
|
# ansible-playbook is started. This is no longer necessary for devel (https://github.com/ansible/ansible/issues/68701
|
||||||
# has been fixed.
|
# is fixed), but 2.9 still needs this since the new collection loader probably won't get backported to stable-2.9.
|
||||||
sed -i -e 's/cryptography.*/cryptography >= 2.9.2/g' /root/venv/lib/python2.7/site-packages/ansible_test/_data/requirements/integration.txt
|
sed -i -e 's/cryptography.*/cryptography >= 2.9.2/g' /root/venv/lib/python2.7/site-packages/ansible_test/_data/requirements/integration.txt
|
||||||
echo 'pyOpenSSL >= 19.1.0' >> /root/venv/lib/python2.7/site-packages/ansible_test/_data/requirements/integration.txt
|
echo 'pyOpenSSL >= 19.1.0' >> /root/venv/lib/python2.7/site-packages/ansible_test/_data/requirements/integration.txt
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue