From 3a48159cf04ed38d030f0fee214d6b0b24dc11c6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 17:49:08 -0400 Subject: [PATCH 01/10] Update ansible-2.6.x --- scripts/ansible-2.6.x | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index f7dce85a3..5055cce7e 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -40,7 +40,8 @@ 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 python-pip python-setuptools python-wheel patch + apt install software-properties-common #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) From eee5183eeb02beb69e8eb3f61f9c4a3b43288813 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 17:49:40 -0400 Subject: [PATCH 02/10] Update ansible --- scripts/ansible | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index f2d43e0d3..a7f867340 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -40,7 +40,8 @@ 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 python-pip python-setuptools python-wheel patch + apt -y install software-properties-common 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) From d1690b7a41dbcf289d209a4a3edad8b09611aadb Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 17:49:55 -0400 Subject: [PATCH 03/10] 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 5055cce7e..853b6830a 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -41,7 +41,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant # 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 install software-properties-common + apt -y install software-properties-common #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) From 653096f599e5845d56aff06f624cab96162368c4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 17:59:31 -0400 Subject: [PATCH 04/10] Update ansible --- scripts/ansible | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index a7f867340..35962bb86 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -41,8 +41,8 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant # 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 software-properties-common # adds command "apt-add-repository" + apt-add-repository -y ppa:ansible/ansible # 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 From 1053a20d5a3ed3b58221c2c378817bf9e1fa6e4a Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 18:08:51 -0400 Subject: [PATCH 05/10] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 35962bb86..d75a3ff55 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -40,7 +40,7 @@ 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 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 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 From 824680aaea4148601f85c38a9d0f177c55926749 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 18:08:56 -0400 Subject: [PATCH 06/10] 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 853b6830a..4c4aac4a8 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -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 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 - 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 From 9ca92f5916e3c8cf04cbcb8c3f17418eeb4e344c Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 18:19:20 -0400 Subject: [PATCH 07/10] 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 4c4aac4a8..881b5ae9c 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -42,7 +42,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant 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 # 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 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.6 # 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 # 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 From f2a14d3cfb8728032e27b7d073d12d50a73975d8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 18:21:50 -0400 Subject: [PATCH 08/10] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index d75a3ff55..53391b9a7 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -42,7 +42,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant 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 # 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 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 # adds correct line to correct file e.g. adds "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 From 4bb93f639c3930905d7f3527ac753f88202ffcab Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 18:22:16 -0400 Subject: [PATCH 09/10] 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 881b5ae9c..387f3a7e4 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -42,7 +42,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant 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 # 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 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-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 # 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 From c3af81bfecefdb85b57847fda848471e714684c3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 18:22:33 -0400 Subject: [PATCH 10/10] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 53391b9a7..1bdb1035f 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -42,7 +42,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant 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 # 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 "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 # 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