Update network structure in prep for playbook overhaul

hosts/router.net.enp.one.yml

@@ -1,6 +1,33 @@
 ---
+description: EN1 Core Router
+
 ansible_network_os: edgeos
 
 targets:
   - admin
   - network
+
+network:
+  ethernet_eth0:
+    address: dhcp
+    description: UPLINK
+    extra:
+      - duplex auto
+      - speed auto
+  ethernet_eth1:
+    address: 10.42.100.1/24
+    description: PUBLIC
+    extra:
+      - duplex auto
+      - speed auto
+  ethernet_eth2:
+    address: 10.42.101.1/24
+    description: PRIVATE
+    extra:
+      - duplex auto
+      - speed auto
+  ethernet_eth2_vif_10:
+    address: 10.42.102.1/24
+    description: SECURE
+    extra:
+      - mtu 1500

omni.ini

@@ -1,3 +1,4 @@
+[network]
 router.net.enp.one
 
 [servers]

vars/network.yml

@@ -1,8 +1,27 @@
 ---
-domain: net.enp.one
+gateway: router.net.enp.one
 
-router:
-  address: router.tre2.local
-  static_dhcp:
-    server: DOMAIN
+dhcp:
+  - name: PUBLIC
+    subnet: 10.42.100.1/24
+    dns: 10.42.100.1
+    domain: tre2.local
+    lease: 21600
+    start: 10.42.100.26
+    stop: 10.42.100.254
+
+  - name: DOMAIN
     subnet: 10.42.101.0/24
+    dns: 10.42.101.1
+    domain: net.enp.one
+    lease: 21600
+    start: 10.42.101.100
+    stop: 10.42.101.254
+
+  - name: SECURE
+    subnet: 10.42.102.0/24
+    dns: 10.42.102.1
+    domain: net.enp.one
+    lease: 3600
+    start: 10.42.102.50
+    stop: 10.42.102.254