.

salt/pillars/network.sls

@@ -1,29 +1,34 @@
 network:
-  domain: suse.lan
   hostname: admin
-  netaddress: 192.168.0.0
-  netmask: 24
-  ip: 192.168.0.1
-  
-  interface:
-    internal: eth0
-    bridge: br0
-    external: eth1
-    wireless: wlan0
-
+  domain: suse.lan
+  interface: eth0 # to be bridged with wlan0 
+  wireless: wlan0 # not to be managed by NetworkManager
+  bridge: br0 # hostapd will create this bridgeport
+  external: eth1
+  ip: 192.168.0.1 # all networks are /24
+  hosts: # key=hostname to be added to /etc/hosts, value=last octate of IP
+    rmt: 1
+    ntp: 1
+    dns: 1
+    www: 1
+    switch: 10
+    harvester: 20
+    node1: 21
+    node2: 22
+    node3: 23
   vlan:
     -
       id: 100
       address: 192.168.100.1
-      netmask: 24
+      zone: public
     -
       id: 200
       address: 192.168.200.1
-      netmask: 24
+      zone: public
     -
       id: 250
       address: 192.168.250.1
-      netmask: 24
+      zone: airgap
   wol:
     1: 7c:10:c9:50:17:9b
     2: 7c:10:c9:50:17:0a