1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 03:32:12 +00:00

Merge pull request #1091 from holta/ansible-on-ubuntu

Fix for Ansible install on Ubuntu, thx to @kananigit
This commit is contained in:
A Holt 2018-09-05 17:55:05 -04:00 committed by GitHub
commit d86c251ae4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View file

@ -40,7 +40,8 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
pip install ansible==$GOOD_VER --disable-pip-version-check pip install ansible==$GOOD_VER --disable-pip-version-check
# Parens are optional, but greatly clarify :) # Parens are optional, but greatly clarify :)
elif (grep -qi ubuntu /etc/lsb-release 2> /dev/null) || (grep -qi ubuntu /etc/os-release); then elif (grep -qi ubuntu /etc/lsb-release 2> /dev/null) || (grep -qi ubuntu /etc/os-release); then
apt -y install python-pip python-setuptools python-wheel patch #apt -y install python-pip python-setuptools python-wheel patch
apt -y install software-properties-common
apt-add-repository -y ppa:ansible/ansible apt-add-repository -y ppa:ansible/ansible
#apt-add-repository -y ppa:ansible/ansible-2.4 #apt-add-repository -y ppa:ansible/ansible-2.4
# elif UBUNTU MUST REMAIN ABOVE (as Ubuntu ALSO contains /etc/debian_version, which would trigger the line just below) # elif UBUNTU MUST REMAIN ABOVE (as Ubuntu ALSO contains /etc/debian_version, which would trigger the line just below)

View file

@ -40,7 +40,8 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
pip install ansible==$GOOD_VER --disable-pip-version-check pip install ansible==$GOOD_VER --disable-pip-version-check
# Parens are optional, but greatly clarify :) # Parens are optional, but greatly clarify :)
elif (grep -qi ubuntu /etc/lsb-release 2> /dev/null) || (grep -qi ubuntu /etc/os-release); then elif (grep -qi ubuntu /etc/lsb-release 2> /dev/null) || (grep -qi ubuntu /etc/os-release); then
apt -y install python-pip python-setuptools python-wheel patch #apt -y install python-pip python-setuptools python-wheel patch
apt -y install software-properties-common
#apt-add-repository -y ppa:ansible/ansible #apt-add-repository -y ppa:ansible/ansible
apt-add-repository -y ppa:ansible/ansible-2.6 apt-add-repository -y ppa:ansible/ansible-2.6
# elif UBUNTU MUST REMAIN ABOVE (as Ubuntu ALSO contains /etc/debian_version, which would trigger the line just below) # elif UBUNTU MUST REMAIN ABOVE (as Ubuntu ALSO contains /etc/debian_version, which would trigger the line just below)