x
/
fuel-ccp-installer
Code Issues Proposed changes

Revert "Change ansible version to 2.2.0" 

This reverts commit 44e4e723cd.

Change-Id: Ib66221fc3d97a8618263d38ba303ddaf747cb992
This commit is contained in:
Artur Zarzycki 2017-01-18 08:14:09 +00:00
parent 44e4e723cd
commit 2d517fccf1
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/jenkins/kargo_deploy.sh
View File

@ -233,10 +233,7 @@ if ! admin_node_command type ansible > /dev/null || \
with_retries admin_node_command -- "sh -c \"sudo apt-add-repository -y 'deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main'\""
wait_for_apt_lock_release
with_retries admin_node_command -- sudo apt-get update
# (FIXME) temporary workaround until https://github.com/kubernetes-incubator/kargo/pull/910 will be merged
with_retries admin_node_command -- wget http://ppa.launchpad.net/ansible/ansible/ubuntu/pool/main/a/ansible/ansible_2.2.0.0-1ppa~xenial_all.deb
wait_for_apt_lock_release
with_retries admin_node_command -- sudo apt -y install ./ansible_2.2.0.0-1ppa~xenial_all.deb
;;
debian)
cat ${BASH_SOURCE%/*}/files/debian_backports_repo.list | admin_node_command "sudo sh -c 'cat - > /etc/apt/sources.list.d/backports.list'"
@ -245,12 +242,10 @@ if ! admin_node_command type ansible > /dev/null || \
with_retries admin_node_command -- sudo apt-get update
wait_for_apt_lock_release
with_retries admin_node_command -- sudo apt-get -y install --only-upgrade python-setuptools
wait_for_apt_lock_release
with_retries admin_node_command -- sudo apt-get install -y ansible
;;
esac
wait_for_apt_lock_release
with_retries admin_node_command -- sudo apt-get install -y python-netaddr git
with_retries admin_node_command -- sudo apt-get install -y ansible python-netaddr git
fi
echo "Checking out kargo playbook..."