Merge "use python-pip3"

This commit is contained in:
Jenkins 2017-07-27 17:25:04 +00:00 committed by Gerrit Code Review
commit 23cbc59845
1 changed files with 2 additions and 3 deletions

View File

@ -273,9 +273,8 @@ 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 python-netaddr libssl-dev python-pip
with_retries admin_node_command -- sudo easy_install --upgrade --user pyasn1
with_retries admin_node_command -- sudo pip install --upgrade ansible==$required_ansible_version
with_retries admin_node_command -- sudo apt-get install -y python-netaddr libssl-dev python3-pip
with_retries admin_node_command -- sudo pip3 install --upgrade ansible==$required_ansible_version
else
echo "ERROR: Unknown Ansible install source: ${ANSIBLE_INSTALL_SOURCE}"
exit 1