From c2ca70b346c865a2e292af5345d397f291e3f113 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Fri, 25 Oct 2019 13:14:44 -0500
Subject: [PATCH] cherry-pick 57d77774fb7602ab39b3a4613b1623e83e8c526c

---
 iiab-install | 5 ++---
 iiab-network | 3 ++-
 iiab-support | 5 +++--
 runrole      | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/iiab-install b/iiab-install
index 6b9e0622e..294f66f4c 100755
--- a/iiab-install
+++ b/iiab-install
@@ -150,7 +150,6 @@ echo -e "Running local playbooks....Stage 0 will now run....followed by Stages $
 
 export ANSIBLE_LOG_PATH="$CWD/iiab-install.log"
 
-ansible -m setup -i $INVENTORY localhost --connection=local >> /dev/null
-ansible-playbook -i $INVENTORY $PLAYBOOK ${ARGS} --connection=local
-
+ansible -m setup -i $INVENTORY localhost --connection=local -e ansible_python_interpreter=/usr/bin/python3 | grep python
+ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local -e ansible_python_interpreter=/usr/bin/python3
 echo -e "./iiab-install $* COMPLETED IN $CWD\n\n"
diff --git a/iiab-network b/iiab-network
index 563ecace6..d473e2053 100755
--- a/iiab-network
+++ b/iiab-network
@@ -25,7 +25,8 @@ fi
 
 echo "Ansible will now run iiab-network.yml -- log file is iiab-network.log"
 Start=`date`
-ansible-playbook -i ansible_hosts iiab-network.yml --connection=local
+ansible -m setup -i $INVENTORY localhost --connection=local -e ansible_python_interpreter=/usr/bin/python3 | grep python
+ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local -e ansible_python_interpreter=/usr/bin/python3
 End=`date`
 
 
diff --git a/iiab-support b/iiab-support
index 7cb48c0c2..8f229a51d 100755
--- a/iiab-support
+++ b/iiab-support
@@ -55,13 +55,14 @@ else
     else
         echo "openvpn_install: True" >> /etc/iiab/local_vars.yml
     fi
-    
+
     if [ -d /opt/iiab/iiab ]; then
         cd /opt/iiab/iiab
         #CWD=`pwd`
         #export ANSIBLE_LOG_PATH="$CWD/iiab-install.log"
         export ANSIBLE_LOG_PATH="/opt/iiab/iiab/iiab-install.log"
-        ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local
+        ansible -m setup -i $INVENTORY localhost --connection=local -e ansible_python_interpreter=/usr/bin/python3 | grep python
+        ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local -e ansible_python_interpreter=/usr/bin/python3
         # Above is tighter/better than running all of "./runrole 1-prep"
         echo
     else
diff --git a/runrole b/runrole
index 8a8d72986..203694d30 100755
--- a/runrole
+++ b/runrole
@@ -33,4 +33,5 @@ if [[ $# -eq 0 ]] ; then
     exit 0
 fi
 
-ansible-playbook -i $INVENTORY $PLAYBOOK ${ARGS} --connection=local -e "role_to_run=$1"
+ansible -m setup -i $INVENTORY localhost --connection=local -e ansible_python_interpreter=/usr/bin/python3 | grep python
+ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local -e ansible_python_interpreter=/usr/bin/python3