From f84bb734650b96c6d29166dedb0a2ad1631b78f3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 29 Jul 2018 12:47:07 -0400 Subject: [PATCH 1/7] Update ansible --- scripts/ansible | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index 91f74eeb7..a4467c4b4 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -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' -GOOD_VER="2.6.1" # Ansible version for OLPC XO laptops (pip install). - # On other OS's we install/upgrade to THE latest (released version of) Ansible. +GOOD_VER="2.6.2" # Ansible version for OLPC XO laptops (pip install). + # NOTE: on other OS's we install/upgrade from PPA, which might provide an even more recent version of Ansible... CURR_VER="undefined" # below are unused for future use # 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 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 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 # CURR_VER=`grep VERSION_ID /etc/*elease | cut -d= -f2` # URL=https://github.com/jvonau/iiab/blob/ansible/vars/fedora-$CURR_VER.yml From 22ad6f51fba240227abdee06a5d2aff36558f832 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 29 Jul 2018 12:49:05 -0400 Subject: [PATCH 2/7] Update ansible-2.6.x --- scripts/ansible-2.6.x | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index b051ff203..e3340b444 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -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' -GOOD_VER="2.6.1" # 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 +GOOD_VER="2.6.2" # Ansible version for OLPC XO laptops (pip install). + # On other OS's we install/upgrade the latest Ansible 2.6.x from PPA, which might provide an even more recent version of Ansible. CURR_VER="undefined" # below are unused for future use # 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 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 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 # CURR_VER=`grep VERSION_ID /etc/*elease | cut -d= -f2` # URL=https://github.com/jvonau/iiab/blob/ansible/vars/fedora-$CURR_VER.yml From b0bb0de0a2166234dd448e6c914dea3758f7324f Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 29 Jul 2018 12:50:25 -0400 Subject: [PATCH 3/7] Update ansible --- scripts/ansible | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index a4467c4b4..314e53ba6 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -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' -GOOD_VER="2.6.2" # Ansible version for OLPC XO laptops (pip install). - # NOTE: on other OS's we install/upgrade from PPA, which might provide an even more recent version of Ansible... +GOOD_VER="2.6.2" # Ansible version for OLPC XO laptops (pip install). + # On other OS's we install/upgrade THE latest from PPA, which might provide an even more recent version of Ansible. CURR_VER="undefined" # below are unused for future use # URL="NA" From c08ebe2d191b976412a1f09f580ae363c751938b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 29 Jul 2018 12:50:52 -0400 Subject: [PATCH 4/7] Update ansible-2.6.x --- scripts/ansible-2.6.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index e3340b444..0f5eab19d 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -13,7 +13,7 @@ echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x-deprecated "slow food", or scri GOOD_VER="2.6.2" # Ansible version for OLPC XO laptops (pip install). - # On other OS's we install/upgrade the latest Ansible 2.6.x from PPA, which might provide an even more recent version of Ansible. + # On other OS's we install/upgrade the latest 2.6.x from PPA, which might provide an even more recent version of Ansible. CURR_VER="undefined" # below are unused for future use # URL="NA" From abe26e9ffc4e04b6f0afe2ec6fd578a1c933255b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 29 Jul 2018 12:54:49 -0400 Subject: [PATCH 5/7] Update ansible-2.6.x --- scripts/ansible-2.6.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index 0f5eab19d..66335dc9c 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -13,7 +13,7 @@ echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x-deprecated "slow food", or scri GOOD_VER="2.6.2" # Ansible version for OLPC XO laptops (pip install). - # On other OS's we install/upgrade the latest 2.6.x from PPA, which might provide an even more recent version of Ansible. + # On other OS's we attempt to install/upgrade the latest 2.6.x from PPA, which might provide an even more recent version of Ansible. CURR_VER="undefined" # below are unused for future use # URL="NA" From 9a408fdc93071dcea4b2a831da7c2622a4a9a284 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 29 Jul 2018 12:55:06 -0400 Subject: [PATCH 6/7] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 314e53ba6..6f2d474ad 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -13,7 +13,7 @@ echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x-deprecated or scripts/ansible-2 GOOD_VER="2.6.2" # Ansible version for OLPC XO laptops (pip install). - # On other OS's we install/upgrade THE latest from PPA, which might provide an even more recent 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" # below are unused for future use # URL="NA" From 0258e469607ad428fa29ca81568baf088aff9f71 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 29 Jul 2018 12:56:23 -0400 Subject: [PATCH 7/7] Update ansible-2.6.x --- scripts/ansible-2.6.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index 66335dc9c..5a035f722 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -13,7 +13,7 @@ echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x-deprecated "slow food", or scri GOOD_VER="2.6.2" # Ansible version for OLPC XO laptops (pip install). - # On other OS's we attempt to install/upgrade the latest 2.6.x from PPA, which might provide an even more recent version of Ansible. + # 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" # below are unused for future use # URL="NA"