Merge pull request #618 from holta/ansible

Small bugs in scripts/ansible & possible tuneup?

scripts/ansible

@@ -1,27 +1,34 @@
 #!/bin/bash -e
-# required to start loading IIAB with ansible
+
-GOOD_VER="2.4.2"
+# Installs or upgrades to the best possible Ansible release, so iiab-install
-FOUND=""
+# can proceed.  Ensure you're online before running this script!
-FAMILY=""
+
-VER=""
+GOOD_VER="2.4.2"      # Ansible version for OLPC, for pip.
+                      # On other OS's we install/upgrade to the latest Ansible.
+                      # Pin all to 2.4.x in future, if really/truly nec?
+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"
+# URL="NA"
+
 export DEBIAN_FRONTEND=noninteractive
-if ! [ $(which ansible-playbook) ]; then
+
+if ! which ansible-playbook ; then
     echo "Installing --- Please Wait"
     if [ -f /etc/centos-release ]; then
         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 http://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.4.2.0-1.el7.ans.noarch.rpm
-        FOUND="yes"
+        # FOUND="true"
-        FAMILY="redhat"
+        # FAMILY="redhat"
 #    elif [ -f /etc/fedora-release ]; then
-#        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-$VER.yml
+#        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="yes"
+#        FOUND="true"
 #        FAMILY="redhat"
     elif [ -f /etc/olpc-release ]; then
         yum -y install ca-certificates nss
@@ -29,51 +36,53 @@ if ! [ $(which ansible-playbook) ]; then
         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="yes"
+        # FOUND="true"
-        FAMILY="olpc"
+        # FAMILY="olpc"
-    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-get -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" \
-            >> /etc/apt/sources.list.d/ansible.list
+                 >> /etc/apt/sources.list.d/ansible.list
             apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
         fi
-        FOUND="yes"
+        # FOUND="true"
-        FAMILY="debian"
+        # FAMILY="debian"
-    elif [ `grep -qi ubuntu /etc/lsb-release` ] ||  [ `grep -qi ubuntu /etc/os-release` ]; then
+        # Parens are optional, but greatly clarify :)
-        apt-get -y install python-pip python-setuptools python-wheel patch
+    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
-        FOUND="yes"
+        # FOUND="true"
-        FAMILY="debian"
+        # FAMILY="debian"
-    fi
+    # fi
-    if [ ! $FOUND = "yes" ]; then
+    # if [ ! $FOUND = "true" ]; then
-        echo 'WARN: Could not detect distro or distro unsupported'
+    else
+        echo "WARN: Could not detect distro or distro unsupported"
         exit 1
     fi
 else
-    VER=`ansible --version|head -n 1|cut -f 2 -d " "`
+    #CURR_VER=`ansible --version | head -n 1 | cut -f 2 -d " "`
-    echo "Current ansible version installed is $VER"
+    CURR_VER=`ansible --version | head -1 | awk '{print $2}'`  # to match iiab-install
+    echo "Current ansible version installed is $CURR_VER"
     if [ -f /etc/centos-release ] || [ -f /etc/fedora-release ]; then
         echo "Please use your system's package manager to update ansible"
         exit 0
-    fi
+    elif [ -f /etc/olpc-release ]; then
-    if [ -f /etc/olpc-release ]; then
         echo "Please use pip package manager to update ansible"
         exit 0
-    fi
+    #fi
-    if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then
+    #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then
-        echo "repos found"
+    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*"
     else
         echo "Upstream ansible source repo not found, please uninstall ansible and re-run this script"
         exit 1
     fi
 fi
 
-if [ ! -f /etc/centos-release ] && [ ! -f /etc/fedora-release ] && \
+if [ ! -f /etc/centos-release ] && [ ! -f /etc/fedora-release ] && [ ! -f /etc/olpc-release ]; then
-   [ ! -f /etc/olpc-release ]; then
+    echo "Using apt to check for updates, then install/upgrade ansible"
-    echo "Using OS package manager to check for ansible updates"
+    apt update
-    apt-get -y update
+    apt -y install ansible
-    apt-get -y install ansible
 fi
 
 # needed?