From 9e7b2182fe01a1897847670c31ba0475430df56b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 12:58:40 -0400 Subject: [PATCH 01/17] Rename ansible-2.2.0 to ansible-2.2.0-deprecated --- scripts/{ansible-2.2.0 => ansible-2.2.0-deprecated} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{ansible-2.2.0 => ansible-2.2.0-deprecated} (100%) diff --git a/scripts/ansible-2.2.0 b/scripts/ansible-2.2.0-deprecated similarity index 100% rename from scripts/ansible-2.2.0 rename to scripts/ansible-2.2.0-deprecated From 4417f8752c6c2c4978f9f11098ee6beebf72b750 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:02:59 -0400 Subject: [PATCH 02/17] "elif ubuntu" must be above "elif debian || raspbian" --- scripts/ansible-2.4.x | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/ansible-2.4.x b/scripts/ansible-2.4.x index a74c84811..3b024626e 100755 --- a/scripts/ansible-2.4.x +++ b/scripts/ansible-2.4.x @@ -39,6 +39,15 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant pip install ansible==$GOOD_VER --disable-pip-version-check # FOUND="true" # FAMILY="olpc" + elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then + apt -y install python-pip python-setuptools python-wheel patch + #apt-add-repository -y ppa:ansible/ansible + apt-add-repository -y ppa:ansible/ansible-2.4 + # FOUND="true" + # FAMILY="debian" + # fi + # if [ ! $FOUND = "true" ]; then + # 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 apt -y install dirmngr python-pip python-setuptools python-wheel patch @@ -51,14 +60,6 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant # FOUND="true" # FAMILY="debian" # Parens are optional, but greatly clarify :) - elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then - apt -y install python-pip python-setuptools python-wheel patch - #apt-add-repository -y ppa:ansible/ansible - apt-add-repository -y ppa:ansible/ansible-2.4 - # FOUND="true" - # FAMILY="debian" - # fi - # if [ ! $FOUND = "true" ]; then else echo "WARN: Could not detect distro or distro unsupported" exit 1 From 3801a6a2e428c204328ed77e624ba3b556a79e5a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:11:33 -0400 Subject: [PATCH 03/17] Update ansible-2.4.x --- scripts/ansible-2.4.x | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/scripts/ansible-2.4.x b/scripts/ansible-2.4.x index 3b024626e..c7298e98b 100755 --- a/scripts/ansible-2.4.x +++ b/scripts/ansible-2.4.x @@ -8,8 +8,6 @@ GOOD_VER="2.4.4" # Ansible version for OLPC XO laptops (pip install). # On other OS's we attempt to install/upgrade/pin to the latest Ansible 2.4.x # WARNING: IIAB 6.6 will likely recommend the very latest Ansible 2.5.x or higher. CURR_VER="undefined" -# FOUND="false" # NOT USED AS OF 2017-12-12 -# FAMILY="undefined" # NOT USED AS OF 2017-12-12 # below are unused for future use # URL="NA" @@ -22,32 +20,23 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant 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 http://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.4.4.0-1.el7.ans.noarch.rpm - # FOUND="true" - # FAMILY="redhat" # 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 # dnf -y install ansible git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python # dnf -y install python-pip python-setuptools python-wheel patch -# FOUND="true" -# FAMILY="redhat" elif [ -f /etc/olpc-release ]; then yum -y install ca-certificates nss 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 pip install --upgrade pip setuptools wheel #EOL just do it pip install ansible==$GOOD_VER --disable-pip-version-check - # FOUND="true" - # FAMILY="olpc" + # Parens are optional, but greatly clarify :) elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then apt -y install python-pip python-setuptools python-wheel patch #apt-add-repository -y ppa:ansible/ansible apt-add-repository -y ppa:ansible/ansible-2.4 - # FOUND="true" - # FAMILY="debian" - # fi - # if [ ! $FOUND = "true" ]; then - # 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 if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then apt -y install dirmngr python-pip python-setuptools python-wheel patch @@ -57,9 +46,6 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant >> /etc/apt/sources.list.d/iiab-ansible.list apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 fi - # FOUND="true" - # FAMILY="debian" - # Parens are optional, but greatly clarify :) else echo "WARN: Could not detect distro or distro unsupported" exit 1 From 51cb7d6432916a924cd0cd638b430a5ca2b6f3cf Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:11:51 -0400 Subject: [PATCH 04/17] "elif ubuntu" must be above "elif debian || raspbian" --- scripts/ansible-2.5.x | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/scripts/ansible-2.5.x b/scripts/ansible-2.5.x index 23c85f097..dcd04a029 100755 --- a/scripts/ansible-2.5.x +++ b/scripts/ansible-2.5.x @@ -7,8 +7,6 @@ echo -e 'OR: consider scripts/ansible to keep up-to-date with Ansible'"'"'s evol GOOD_VER="2.5.0" # Ansible version for OLPC XO laptops (pip install). # On other OS's we attempt to install/upgrade/pin to the latest Ansible 2.5.x CURR_VER="undefined" -# FOUND="false" # NOT USED AS OF 2017-12-12 -# FAMILY="undefined" # NOT USED AS OF 2017-12-12 # below are unused for future use # URL="NA" @@ -21,23 +19,23 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant 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 http://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.5.0-1.el7.ans.noarch.rpm - # FOUND="true" - # FAMILY="redhat" # 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 # dnf -y install ansible git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python # dnf -y install python-pip python-setuptools python-wheel patch -# FOUND="true" -# FAMILY="redhat" elif [ -f /etc/olpc-release ]; then yum -y install ca-certificates nss 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 pip install --upgrade pip setuptools wheel #EOL just do it pip install ansible==$GOOD_VER --disable-pip-version-check - # FOUND="true" - # FAMILY="olpc" + # Parens are optional, but greatly clarify :) + elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then + apt -y install python-pip python-setuptools python-wheel patch + #apt-add-repository -y ppa:ansible/ansible + 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 [ -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 apt -y install dirmngr python-pip python-setuptools python-wheel patch @@ -47,17 +45,6 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant >> /etc/apt/sources.list.d/iiab-ansible.list apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 fi - # FOUND="true" - # FAMILY="debian" - # Parens are optional, but greatly clarify :) - elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then - apt -y install python-pip python-setuptools python-wheel patch - #apt-add-repository -y ppa:ansible/ansible - apt-add-repository -y ppa:ansible/ansible-2.5 - # FOUND="true" - # FAMILY="debian" - # fi - # if [ ! $FOUND = "true" ]; then else echo "WARN: Could not detect distro or distro unsupported" exit 1 From 92a664901eae2e2f59c8729acf812e5743cf8d59 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:11:57 -0400 Subject: [PATCH 05/17] "elif ubuntu" must be above "elif debian || raspbian" --- scripts/ansible | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index 8ca758331..442ded4e6 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -7,8 +7,6 @@ echo -e 'OR: consider scripts/ansible-2.4.x for a "slow food" alternative.\n' GOOD_VER="2.5.0" # Ansible version for OLPC XO laptops (pip install). # On other OS's we install/upgrade to THE latest (released version of) Ansible. CURR_VER="undefined" -# FOUND="false" # NOT USED AS OF 2017-12-12 -# FAMILY="undefined" # NOT USED AS OF 2017-12-12 # below are unused for future use # URL="NA" @@ -21,23 +19,23 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant 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 http://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.5.0-1.el7.ans.noarch.rpm - # FOUND="true" - # FAMILY="redhat" # 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 # dnf -y install ansible git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python # dnf -y install python-pip python-setuptools python-wheel patch -# FOUND="true" -# FAMILY="redhat" elif [ -f /etc/olpc-release ]; then yum -y install ca-certificates nss 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 pip install --upgrade pip setuptools wheel #EOL just do it pip install ansible==$GOOD_VER --disable-pip-version-check - # FOUND="true" - # FAMILY="olpc" + # Parens are optional, but greatly clarify :) + elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then + apt -y install python-pip python-setuptools python-wheel patch + apt-add-repository -y ppa:ansible/ansible + #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 if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then apt -y install dirmngr python-pip python-setuptools python-wheel patch @@ -47,17 +45,6 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant # >> /etc/apt/sources.list.d/iiab-ansible.list apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 fi - # FOUND="true" - # FAMILY="debian" - # Parens are optional, but greatly clarify :) - elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then - apt -y install python-pip python-setuptools python-wheel patch - apt-add-repository -y ppa:ansible/ansible - #apt-add-repository -y ppa:ansible/ansible-2.4 - # FOUND="true" - # FAMILY="debian" - # fi - # if [ ! $FOUND = "true" ]; then else echo "WARN: Could not detect distro or distro unsupported" exit 1 From 42f6a4eb4c79bb5bf2d69bd287097b6ea4a1de00 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:13:37 -0400 Subject: [PATCH 06/17] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 442ded4e6..9c6d0bae7 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -35,7 +35,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant apt -y install python-pip python-setuptools python-wheel patch apt-add-repository -y ppa:ansible/ansible #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 if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then apt -y install dirmngr python-pip python-setuptools python-wheel patch From fa1d561c9eb9b2a05b200e1dfe7db7e0d604b8b4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:13:52 -0400 Subject: [PATCH 07/17] Update ansible-2.5.x --- scripts/ansible-2.5.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.5.x b/scripts/ansible-2.5.x index dcd04a029..b1da0ab0f 100755 --- a/scripts/ansible-2.5.x +++ b/scripts/ansible-2.5.x @@ -35,7 +35,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant apt -y install python-pip python-setuptools python-wheel patch #apt-add-repository -y ppa:ansible/ansible 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 if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then apt -y install dirmngr python-pip python-setuptools python-wheel patch From fc36dc1e712e8e369e46dada693aea9206e567c9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:14:13 -0400 Subject: [PATCH 08/17] Update ansible-2.4.x --- scripts/ansible-2.4.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.4.x b/scripts/ansible-2.4.x index c7298e98b..bccd5178b 100755 --- a/scripts/ansible-2.4.x +++ b/scripts/ansible-2.4.x @@ -36,7 +36,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant apt -y install python-pip python-setuptools python-wheel patch #apt-add-repository -y ppa:ansible/ansible 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 if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then apt -y install dirmngr python-pip python-setuptools python-wheel patch From 3290e052bc8311ce2cc6da0f3969a9351d72a16b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:34:19 -0400 Subject: [PATCH 09/17] Update ansible-2.4.x --- scripts/ansible-2.4.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.4.x b/scripts/ansible-2.4.x index bccd5178b..3f40ac3f7 100755 --- a/scripts/ansible-2.4.x +++ b/scripts/ansible-2.4.x @@ -64,7 +64,7 @@ else #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then elif (grep -qi ansible /etc/apt/sources.list) || (ls /etc/apt/sources.list.d/*ansible*.list >/dev/null 2>&1) ; then #echo "Ansible repo(s) found within /etc/apt/sources.list*" - echo -e '\nANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.4/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.4.x -- AND REMOVE ALL SIMILAR LINES -- then re-run this script.\n' + echo -e '\nMANUAL INTERVENTION REQUIRED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.4/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.4.x -- AND REMOVE ALL SIMILAR LINES -- then re-run this script.\n' else echo "Upstream ansible source repo not found, please uninstall ansible and re-run this script" exit 1 From ddb9f54993592d30872656ffa9e97248c75833ff Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:34:53 -0400 Subject: [PATCH 10/17] Update ansible-2.5.x --- scripts/ansible-2.5.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.5.x b/scripts/ansible-2.5.x index b1da0ab0f..f4efa443b 100755 --- a/scripts/ansible-2.5.x +++ b/scripts/ansible-2.5.x @@ -63,7 +63,7 @@ else #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then elif (grep -qi ansible /etc/apt/sources.list) || (ls /etc/apt/sources.list.d/*ansible*.list >/dev/null 2>&1) ; then #echo "Ansible repo(s) found within /etc/apt/sources.list*" - echo -e '\nANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.5/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.5.x -- AND REMOVE ALL SIMILAR LINES -- then re-run this script.\n' + echo -e '\nMANUAL INTERVENTION REQUIRED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.5/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.5.x -- AND REMOVE ALL SIMILAR LINES -- then re-run this script.\n' else echo "Upstream ansible source repo not found, please uninstall ansible and re-run this script" exit 1 From 96f113059c2ff3e526e98b8bf474411323d3bc53 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:38:32 -0400 Subject: [PATCH 11/17] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 9c6d0bae7..57a34874f 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -63,7 +63,7 @@ else #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then elif (grep -qi ansible /etc/apt/sources.list) || (ls /etc/apt/sources.list.d/*ansible*.list >/dev/null 2>&1) ; then #echo "Ansible repo(s) found within /etc/apt/sources.list*" - echo -e '\nANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" IF YOU WANT THE LATEST RELEASED VERSION OF ANSIBLE -- then re-run this script.\n' + echo -e '\nMANUAL INTERVENTION URGED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" IF YOU WANT THE LATEST RELEASED VERSION OF ANSIBLE -- then re-run this script.\n' else echo "Upstream ansible source repo not found, please uninstall ansible and re-run this script" exit 1 From 1e15836af628698884ff58b59b1df559f55526e8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:38:52 -0400 Subject: [PATCH 12/17] Update ansible-2.5.x --- scripts/ansible-2.5.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.5.x b/scripts/ansible-2.5.x index f4efa443b..a9e91036a 100755 --- a/scripts/ansible-2.5.x +++ b/scripts/ansible-2.5.x @@ -63,7 +63,7 @@ else #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then elif (grep -qi ansible /etc/apt/sources.list) || (ls /etc/apt/sources.list.d/*ansible*.list >/dev/null 2>&1) ; then #echo "Ansible repo(s) found within /etc/apt/sources.list*" - echo -e '\nMANUAL INTERVENTION REQUIRED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.5/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.5.x -- AND REMOVE ALL SIMILAR LINES -- then re-run this script.\n' + echo -e '\nMANUAL INTERVENTION URGED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.5/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.5.x -- AND REMOVE ALL SIMILAR LINES -- then re-run this script.\n' else echo "Upstream ansible source repo not found, please uninstall ansible and re-run this script" exit 1 From 125c95718e7ae43c2ba1d7ad9f376b5ec5484cd5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:39:08 -0400 Subject: [PATCH 13/17] Update ansible-2.4.x --- scripts/ansible-2.4.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.4.x b/scripts/ansible-2.4.x index 3f40ac3f7..b78897345 100755 --- a/scripts/ansible-2.4.x +++ b/scripts/ansible-2.4.x @@ -64,7 +64,7 @@ else #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then elif (grep -qi ansible /etc/apt/sources.list) || (ls /etc/apt/sources.list.d/*ansible*.list >/dev/null 2>&1) ; then #echo "Ansible repo(s) found within /etc/apt/sources.list*" - echo -e '\nMANUAL INTERVENTION REQUIRED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.4/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.4.x -- AND REMOVE ALL SIMILAR LINES -- then re-run this script.\n' + echo -e '\nMANUAL INTERVENTION URGED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.4/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.4.x -- AND REMOVE ALL SIMILAR LINES -- then re-run this script.\n' else echo "Upstream ansible source repo not found, please uninstall ansible and re-run this script" exit 1 From b7acab52fda0a886205c1b4b43d48ecd3bbe3e1f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 13:54:21 -0400 Subject: [PATCH 14/17] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 57a34874f..1d60fbdf5 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -2,7 +2,7 @@ echo -e '\nATTEMPTING TO INSTALL THE LATEST (RELEASED VERSION OF) ANSIBLE.' echo -e 'Ensure you'"'"'re online before running this script!' -echo -e 'OR: consider scripts/ansible-2.4.x for a "slow food" alternative.\n' +echo -e 'OR: consider scripts/ansible-2.4.x or scripts/ansible/2.5.x "slow food" instead.\n' GOOD_VER="2.5.0" # Ansible version for OLPC XO laptops (pip install). # On other OS's we install/upgrade to THE latest (released version of) Ansible. From 51440cea87d20add76af9e028e12e97b2a78422b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 14:00:45 -0400 Subject: [PATCH 15/17] Update ansible-2.4.x --- scripts/ansible-2.4.x | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible-2.4.x b/scripts/ansible-2.4.x index b78897345..4e8e74595 100755 --- a/scripts/ansible-2.4.x +++ b/scripts/ansible-2.4.x @@ -2,7 +2,7 @@ echo -e '\nATTEMPTING TO INSTALL THE LATEST ANSIBLE 2.4.x' echo -e 'Ensure you'"'"'re online before running this script!' -echo -e 'OR: consider scripts/ansible to keep up-to-date with Ansible'"'"'s evolution.\n' +echo -e 'OR: consider scripts/ansible-2.5.x\nOR: consider scripts/ansible to keep up-to-date with Ansible'"'"'s evolution.\n' GOOD_VER="2.4.4" # Ansible version for OLPC XO laptops (pip install). # On other OS's we attempt to install/upgrade/pin to the latest Ansible 2.4.x @@ -64,7 +64,7 @@ else #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then elif (grep -qi ansible /etc/apt/sources.list) || (ls /etc/apt/sources.list.d/*ansible*.list >/dev/null 2>&1) ; then #echo "Ansible repo(s) found within /etc/apt/sources.list*" - echo -e '\nMANUAL INTERVENTION URGED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.4/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.4.x -- AND REMOVE ALL SIMILAR LINES -- then re-run this script.\n' + echo -e '\nMANUAL INTERVENTION URGED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.4/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.4.x -- AND REMOVE ALL SIMILAR LINES TO ENSURE ANSIBLE UPDATES CLEANLY -- then re-run this script.\n' else echo "Upstream ansible source repo not found, please uninstall ansible and re-run this script" exit 1 From 423174ddc870675bab90ed05280cddd31d256dec Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 14:01:53 -0400 Subject: [PATCH 16/17] Update ansible-2.5.x --- scripts/ansible-2.5.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.5.x b/scripts/ansible-2.5.x index a9e91036a..38c31b64a 100755 --- a/scripts/ansible-2.5.x +++ b/scripts/ansible-2.5.x @@ -63,7 +63,7 @@ else #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then elif (grep -qi ansible /etc/apt/sources.list) || (ls /etc/apt/sources.list.d/*ansible*.list >/dev/null 2>&1) ; then #echo "Ansible repo(s) found within /etc/apt/sources.list*" - echo -e '\nMANUAL INTERVENTION URGED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.5/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.5.x -- AND REMOVE ALL SIMILAR LINES -- then re-run this script.\n' + echo -e '\nMANUAL INTERVENTION URGED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.5/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.5.x -- AND REMOVE ALL SIMILAR LINES TO ENSURE ANSIBLE UPDATES CLEANLY -- then re-run this script.\n' else echo "Upstream ansible source repo not found, please uninstall ansible and re-run this script" exit 1 From ff2ff935dae020aa30caca3f3ed20adc7f3fa569 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 5 Apr 2018 14:49:10 -0400 Subject: [PATCH 17/17] EXPERIMENT WITH iiab_usb_lib_show_all: True --- vars/medium.localvars | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/medium.localvars b/vars/medium.localvars index 5b74044bc..280d93499 100644 --- a/vars/medium.localvars +++ b/vars/medium.localvars @@ -94,6 +94,9 @@ cups_enabled: False samba_install: False samba_enabled: False +# Show entire contents of USB sticks/drives (at http://box/usb) +iiab_usb_lib_show_all: True + # 5-XO-SERVICES # Lesser-supported XO services need additional testing. Please contact