From 51164d9aab09ad9d81fde830f6f6cd32a0f16ae7 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Fri, 28 Jul 2017 16:45:19 +0300 Subject: [PATCH] switch back to python2 Change-Id: I606bfd79db64370fc60352cad113e81259cbd254 --- utils/jenkins/kargo_deploy.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/jenkins/kargo_deploy.sh b/utils/jenkins/kargo_deploy.sh index 0929b4f..00144a1 100755 --- a/utils/jenkins/kargo_deploy.sh +++ b/utils/jenkins/kargo_deploy.sh @@ -273,8 +273,10 @@ if ! admin_node_command type ansible 2>&1 > /dev/null; then if [[ "$ANSIBLE_INSTALL_SOURCE" == "apt" ]]; then with_retries admin_node_command -- sudo apt-get install -y ansible python-netaddr elif [[ "$ANSIBLE_INSTALL_SOURCE" == "pip" ]]; then - with_retries admin_node_command -- sudo apt-get install -y python3-netaddr libssl-dev python3-pip - with_retries admin_node_command -- sudo pip3 install --upgrade ansible==$required_ansible_version + admin_node_command -- sudo pip uninstall -y setuptools pip || true + with_retries admin_node_command -- sudo apt-get install -y --reinstall python-netaddr libssl-dev python-pip python-setuptools python-pkg-resources + with_retries admin_node_command -- sudo -H easy_install pyopenssl==16.2.0 + with_retries admin_node_command -- sudo pip install --upgrade ansible==$required_ansible_version else echo "ERROR: Unknown Ansible install source: ${ANSIBLE_INSTALL_SOURCE}" exit 1