FLEEK-125 Remove six before redeploy-ansible

remove six module to avoid hitting a bug in setuptools 34.1.0
pypa/setuptools#951
this will be reinstalled fresh during the redeploy of ansible

Author: Antony Messerli

scripts/pre_leap.sh

@@ -43,10 +43,10 @@ fi
 # RLM-682 versions past 2.5.2 break things
 echo "python-ldap==2.5.2" >> /opt/rpc-openstack/openstack-ansible/global-requirement-pins.txt
 
-# FLEEK-125 six module exceptions on 34.1.0 so if we find this in pins, use the one set in mitaka-eol
-if grep '^setuptools==34.1.0' /opt/rpc-openstack/openstack-ansible/global-requirement-pins.txt; then
-  sed -i 's|^setuptools.*|setuptools==33.1.1|g' /opt/rpc-openstack/openstack-ansible/global-requirement-pins.txt
-fi
+# remove six and cryptography modules to avoid hitting a bug in setuptools 34.1.0
+# https://github.com/pypa/setuptools/issues/951
+# this will be reinstalled fresh during the redeploy of ansible
+pip uninstall -y six cryptography
 
 # RLM-1375 Skip certain hardening tags during leap
 export SKIP_HARDENING_TAGS="V-38462,V-38660"