From c32b3518cd19f0038b9979af6dc9672ed4b5b289 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Mon, 30 Oct 2017 12:57:55 -0500
Subject: [PATCH] scripts cleanup

---
 iiab-network    | 15 +++------------
 install-support |  3 ++-
 runtags         | 14 +++-----------
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/iiab-network b/iiab-network
index 87be5ccdc..eb9f1b239 100755
--- a/iiab-network
+++ b/iiab-network
@@ -1,15 +1,8 @@
 #!/bin/bash
-
-if [ -f /etc/iiab/iiab.env ]
-then
-  . /etc/iiab/iiab.env
-  cd $IIAB_DIR
-else
-  echo /etc/iiab/iiab.env is missing. Playbook has not been run.
-  exit 1
-fi
-
+# running from a git repo
+# ansible files exist
 CWD=`pwd`
+export ANSIBLE_LOG_PATH="$CWD/iiab-network.log"
 
 if [ ! -f iiab-network.yml ]
 then
@@ -25,7 +18,6 @@ then
 fi
 
 Start=`date`
-export ANSIBLE_LOG_PATH="$XSCE_DIR/iiab-network.log"
 ansible-playbook -i ansible_hosts iiab-network.yml --connection=local
 End=`date`
 echo "" >> iiab-network.log
@@ -46,4 +38,3 @@ ip r
 brctl show br0
 echo "run start:$Start"
 echo "run end: $End"
-
diff --git a/install-support b/install-support
index b7df01489..79439f2f7 100755
--- a/install-support
+++ b/install-support
@@ -4,6 +4,8 @@ PLAYBOOK="iiab-base.yml"
 INVENTORY="ansible_hosts"
 CWD=`pwd`
 
+export ANSIBLE_LOG_PATH="$CWD/iiab-install.log"
+
 if [ ! -f $PLAYBOOK ]
 then
  echo "IIAB Playbook not found."
@@ -15,5 +17,4 @@ fi
 sed -i -e "s/openvpn_install: False/openvpn_install: True/" vars/local_vars.yml
 sed -i -e "s/openvpn_enabled: False/openvpn_enabled: True/" vars/local_vars.yml
 
-export ANSIBLE_LOG_PATH="$CWD/iiab-install.log"
 ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local
diff --git a/runtags b/runtags
index b353d3a65..45ee507e7 100755
--- a/runtags
+++ b/runtags
@@ -1,16 +1,11 @@
 #!/bin/bash
+# running from a git repo
 PLAYBOOK="iiab.yml"
 INVENTORY="ansible_hosts"
-# Pass cmdline options for ansible
-
-if [ -f /etc/iiab/iiab.env ]
-then
-  . /etc/iiab/iiab.env
-  cd $IIAB_DIR
-fi
-
 CWD=`pwd`
 
+export ANSIBLE_LOG_PATH="$CWD/iiab-debug.log"
+
 if [ ! -f $PLAYBOOK ]
 then
  echo "IIAB Playbook not found."
@@ -41,8 +36,6 @@ do
   fi
 done
 
-# echo $found
-
 taglist=$1
 
 if [ "$found" == "N" ]
@@ -50,5 +43,4 @@ then
   taglist="0-init,"$taglist
 fi
 
-export ANSIBLE_LOG_PATH="$CWD/iiab-debug.log"
 ansible-playbook -i ansible_hosts iiab.yml --connection=local --tags="""$taglist"""