external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 03:32:12 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Fix for Ansible install on Ubuntu, thx to @kananigit (part 2)
This commit is contained in:
A Holt 2018-09-05 18:24:03 -04:00 committed by GitHub
commit 94c7ff6947
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/ansible
View file

@ -40,9 +40,9 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
pip install ansible==$GOOD_VER --disable-pip-version-check
# Parens are optional, but greatly clarify :)
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 software-properties-common
apt-add-repository -y ppa:ansible/ansible
#apt -y install python-pip python-setuptools python-wheel patch # 2018-09-05: fails on @kananigit's Ubuntu 18.04/Server. Fix @ https://github.com/iiab/iiab/pull/1091
apt -y install software-properties-common # adds command "apt-add-repository"
apt-add-repository -y ppa:ansible/ansible # adds correct line to correct file e.g. adds line "deb http://ppa.launchpad.net/ansible/ansible/ubuntu bionic main" to /etc/apt/sources.list.d/ansible-ubuntu-ansible-bionic.list
#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 [ -f /etc/debian_version ] || (grep -qi raspbian /etc/*elease) ; then

6
scripts/ansible-2.6.x
View file

@ -40,10 +40,10 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
pip install ansible==$GOOD_VER --disable-pip-version-check
# Parens are optional, but greatly clarify :)
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 software-properties-common
#apt -y install python-pip python-setuptools python-wheel patch # 2018-09-05: fails on @kananigit's Ubuntu 18.04/Server. Fix @ https://github.com/iiab/iiab/pull/1091
apt -y install software-properties-common # adds command "apt-add-repository"
apt-add-repository -y ppa:ansible/ansible-2.6 # adds correct line to correct file e.g. adds line "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu bionic main" to /etc/apt/sources.list.d/ansible-ubuntu-ansible-bionic.list
#apt-add-repository -y ppa:ansible/ansible
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 [ -f /etc/debian_version ] || (grep -qi raspbian /etc/*elease) ; then
if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then