mirror of
https://github.com/iiab/iiab.git
synced 2025-02-13 19:52:06 +00:00
Merge pull request #978 from holta/ansible-2.6.2
Recommend Ansible 2.6.2
This commit is contained in:
commit
4a6bfe805f
2 changed files with 6 additions and 6 deletions
|
@ -12,8 +12,8 @@ echo -e 'Ensure you'"'"'re online before running this (/opt/iiab/iiab/scripts/an
|
||||||
echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x-deprecated or scripts/ansible-2.6.x\n\n'
|
echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x-deprecated or scripts/ansible-2.6.x\n\n'
|
||||||
|
|
||||||
|
|
||||||
GOOD_VER="2.6.1" # Ansible version for OLPC XO laptops (pip install).
|
GOOD_VER="2.6.2" # Ansible version for OLPC XO laptops (pip install).
|
||||||
# On other OS's we install/upgrade to THE latest (released version of) Ansible.
|
# On other OS's we attempt to install/upgrade THE latest from PPA, which might provide an even more recent version of Ansible.
|
||||||
CURR_VER="undefined"
|
CURR_VER="undefined"
|
||||||
# below are unused for future use
|
# below are unused for future use
|
||||||
# URL="NA"
|
# URL="NA"
|
||||||
|
@ -26,7 +26,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
|
||||||
yum -y install ca-certificates nss epel-release
|
yum -y install ca-certificates nss epel-release
|
||||||
yum -y install git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python
|
yum -y install git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python
|
||||||
yum -y install python-pip python-setuptools python-wheel patch
|
yum -y install python-pip python-setuptools python-wheel patch
|
||||||
yum -y install https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.5.5-1.el7.ans.noarch.rpm
|
yum -y install https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.6.2-1.el7.ans.noarch.rpm
|
||||||
# elif [ -f /etc/fedora-release ]; then
|
# elif [ -f /etc/fedora-release ]; then
|
||||||
# CURR_VER=`grep VERSION_ID /etc/*elease | cut -d= -f2`
|
# CURR_VER=`grep VERSION_ID /etc/*elease | cut -d= -f2`
|
||||||
# URL=https://github.com/jvonau/iiab/blob/ansible/vars/fedora-$CURR_VER.yml
|
# URL=https://github.com/jvonau/iiab/blob/ansible/vars/fedora-$CURR_VER.yml
|
||||||
|
|
|
@ -12,8 +12,8 @@ echo -e 'Ensure you'"'"'re online before running this (/opt/iiab/iiab/scripts/an
|
||||||
echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x-deprecated "slow food", or scripts/ansible for the latest.\n\n'
|
echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x-deprecated "slow food", or scripts/ansible for the latest.\n\n'
|
||||||
|
|
||||||
|
|
||||||
GOOD_VER="2.6.1" # Ansible version for OLPC XO laptops (pip install).
|
GOOD_VER="2.6.2" # Ansible version for OLPC XO laptops (pip install).
|
||||||
# On other OS's we attempt to install/upgrade/pin to the latest Ansible 2.6.x
|
# On other OS's we attempt to install/upgrade/pin to the latest 2.6.x from PPA, which might provide an even more recent version of Ansible.
|
||||||
CURR_VER="undefined"
|
CURR_VER="undefined"
|
||||||
# below are unused for future use
|
# below are unused for future use
|
||||||
# URL="NA"
|
# URL="NA"
|
||||||
|
@ -26,7 +26,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
|
||||||
yum -y install ca-certificates nss epel-release
|
yum -y install ca-certificates nss epel-release
|
||||||
yum -y install git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python
|
yum -y install git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python
|
||||||
yum -y install python-pip python-setuptools python-wheel patch
|
yum -y install python-pip python-setuptools python-wheel patch
|
||||||
yum -y install https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.5.5-1.el7.ans.noarch.rpm
|
yum -y install https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.6.2-1.el7.ans.noarch.rpm
|
||||||
# elif [ -f /etc/fedora-release ]; then
|
# elif [ -f /etc/fedora-release ]; then
|
||||||
# CURR_VER=`grep VERSION_ID /etc/*elease | cut -d= -f2`
|
# CURR_VER=`grep VERSION_ID /etc/*elease | cut -d= -f2`
|
||||||
# URL=https://github.com/jvonau/iiab/blob/ansible/vars/fedora-$CURR_VER.yml
|
# URL=https://github.com/jvonau/iiab/blob/ansible/vars/fedora-$CURR_VER.yml
|
||||||
|
|
Loading…
Reference in a new issue