update scripts a bit

iiab-network

@@ -1,15 +1,8 @@
 #!/bin/bash
-
+# running from a git repo
-if [ -f /etc/iiab/iiab.env ]
+# ansible files exist
-then
-  . /etc/iiab/iiab.env
-  cd $IIAB_DIR
-else
-  echo /etc/iiab/iiab.env is missing. Playbook has not been run.
-  exit 1
-fi
-
 CWD=`pwd`
+export ANSIBLE_LOG_PATH="$CWD/iiab-network.log"
 
 if [ ! -f iiab-network.yml ]
 then
@@ -24,7 +17,6 @@ then
    touch /etc/iiab/config_vars.yml
 fi
 
-export ANSIBLE_LOG_PATH="$CWD/iiab-network.log"
 ansible-playbook -i ansible_hosts iiab-network.yml --connection=local
 echo "" >> iiab-network.log
 ls -la /etc/sys*/net*/ifcfg* >> iiab-network.log

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

runansible

@@ -1,9 +1,26 @@
 #!/bin/bash -e
-PLAYBOOK="iiab.yml"
+# running from a git repo
+PLAYBOOK="iiab-steps.yml"
 INVENTORY="ansible_hosts"
+CWD=`pwd`
 # Pass cmdline options for ansible
 ARGS="$@"
 
+export ANSIBLE_LOG_PATH="$CWD/iiab-install.log"
+
+if [ ! -f /etc/ansible/facts.d/local_facts.fact ]; then
+   mkdir -p /etc/ansible/facts.d
+fi
+cp ./scripts/local_facts.fact /etc/ansible/facts.d/local_facts.fact
+
+if [ ! -f $PLAYBOOK ]
+then
+ echo "IIAB Playbook not found."
+ echo "Please run this command from the top level of the git repo."
+ echo "Exiting."
+ exit 1
+fi
+
 # if vars/local_vars.yml is missing, put a default one in place - First Run
 if [ ! -f ./vars/local_vars.yml ]; then
     OS=`grep ^ID= /etc/*release|cut -d= -f2`
@@ -23,43 +40,6 @@ if [ ! -f ./vars/local_vars.yml ]; then
     esac
 fi
 
-# copy var files to /etc/iiab for subsequent use
-# If iiab.env exists, on second or upgrade run, check for stale variables
-# iiab.env gets created at the end of stage-4 on First Run
-if [ -f /etc/iiab/iiab.env ]
-then
-  OLD=`grep XSCE /etc/iiab/iiab.env`
-  if [ x"$OLD" != "x" ]
-  then
-    rm /etc/iiab/iiab.env
-  else
-    . /etc/iiab/iiab.env
-    cd $IIAB_DIR
-  fi
-else
-  mkdir -p /etc/iiab
-  echo "{}" > /etc/iiab/config_vars.yml
-fi
-
-CWD=`pwd`
-
-if [ ! -f $PLAYBOOK ]
-then
- echo "IIAB Playbook not found."
- echo "Please run this command from the top level of the git repo."
- echo "Exiting."
- exit 1
-fi
-
-if [ ! -f /etc/ansible/facts.d/local_facts.fact ]; then
-   mkdir -p /etc/ansible/facts.d
-fi
-cp ./scripts/local_facts.fact /etc/ansible/facts.d/local_facts.fact
-
 echo "Running local playbooks! "
-
-
-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

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"""