external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #742 from jvonau/ans_fix

Browse source 
scripts/ansible* cleanup - see github.com/jvonau/iiab/issues/18
This commit is contained in:
A Holt 2018-04-18 18:41:23 -04:00 • committed by GitHub
commit fc372ce2df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/ansible
View file

@ -31,13 +31,14 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
pip install --upgrade pip setuptools wheel #EOL just do it pip install --upgrade pip setuptools wheel #EOL just do it
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) || (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-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)
elif [ -f /etc/debian_version ] || (grep -qi raspbian /etc/*elease) ; then 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 if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then
apt update
apt -y install dirmngr python-pip python-setuptools python-wheel patch apt -y install dirmngr python-pip python-setuptools python-wheel patch
echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \ echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \
>> /etc/apt/sources.list.d/iiab-ansible.list >> /etc/apt/sources.list.d/iiab-ansible.list

3
scripts/ansible-2.4.x
View file

@ -32,13 +32,14 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
pip install --upgrade pip setuptools wheel #EOL just do it pip install --upgrade pip setuptools wheel #EOL just do it
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) || (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-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)
elif [ -f /etc/debian_version ] || (grep -qi raspbian /etc/*elease) ; then 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 if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then
apt update
apt -y install dirmngr python-pip python-setuptools python-wheel patch apt -y install dirmngr python-pip python-setuptools python-wheel patch
#echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \ #echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \
# >> /etc/apt/sources.list.d/iiab-ansible.list # >> /etc/apt/sources.list.d/iiab-ansible.list

3
scripts/ansible-2.5.x
View file

@ -31,13 +31,14 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
pip install --upgrade pip setuptools wheel #EOL just do it pip install --upgrade pip setuptools wheel #EOL just do it
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) || (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-add-repository -y ppa:ansible/ansible #apt-add-repository -y ppa:ansible/ansible
apt-add-repository -y ppa:ansible/ansible-2.5 apt-add-repository -y ppa:ansible/ansible-2.5
# 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)
elif [ -f /etc/debian_version ] || (grep -qi raspbian /etc/*elease) ; then 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 if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then
apt update
apt -y install dirmngr python-pip python-setuptools python-wheel patch apt -y install dirmngr python-pip python-setuptools python-wheel patch
#echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \ #echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \
# >> /etc/apt/sources.list.d/iiab-ansible.list # >> /etc/apt/sources.list.d/iiab-ansible.list