Merge pull request #45 from iiab/master

sync from iiab/iiab

iiab-network

@@ -16,34 +16,37 @@ if [ ! -f /etc/iiab/config_vars.yml ]; then
     echo "{}" > /etc/iiab/config_vars.yml
 fi
 
+OS="unknown"   # will be overridden below, if /etc/iiab/iiab.env is legit
 if [ -f /etc/iiab/iiab.env ]; then
     source /etc/iiab/iiab.env
-else
-    OS="unknown"
 fi
 
 Start=`date`
 ansible-playbook -i ansible_hosts iiab-network.yml --connection=local
 End=`date`
+
+# Record critical diagnostics to [/opt/iiab/iiab/]iiab-network.log
 echo "" >> iiab-network.log
 # redhat path
-if [ ! "OS" == "debian" ] && [ ! "OS" == "unknown" ]; then
+if [ "OS" == "centos" ] || [  "OS" == "fedora" ]; then
-   ls -la /etc/sys*/net*/ifcfg* >> iiab-network.log
+    ls -la /etc/sys*/net*/ifcfg* >> iiab-network.log
 fi
-# ubuntu destop might be using NM - split out.
+# Ubuntu desktop might be using NM - split out.
 if [ $(which nmcli) ]; then
-   nmcli d >> iiab-network.log
+    nmcli d >> iiab-network.log
-   nmcli c >> iiab-network.log
+    nmcli c >> iiab-network.log
 fi
 echo "" >> iiab-network.log
 ip r >> iiab-network.log
 echo "" >> iiab-network.log
-brctl show br0>> iiab-network.log
+brctl show >> iiab-network.log
 echo "run start: $Start" >> iiab-network.log
 echo "run end: $End" >> iiab-network.log
 echo "" >> iiab-network.log
 echo "" >> iiab-network.log
+
+# Put the same diagnostics on screen, for live operator
 ip r
-brctl show br0
+brctl show
-echo "run start:$Start"
+echo "run start: $Start"
 echo "run end: $End"

roles/network/templates/network/bridge-br0

@@ -6,7 +6,7 @@ interface-name=br0
 permissions=
 
 [ipv4]
-address1={{ iiab_lan_ip }}/19
+address1={{ lan_ip }}/19
 dns-search={{ iiab_domain }}
 method=manual