From 8681e47fb330d65690af34f094767c0e58ebf2a6 Mon Sep 17 00:00:00 2001
From: Daniel Poelzleithner <git@poelzi.org>
Date: Thu, 15 Aug 2019 18:18:37 +0200
Subject: [PATCH] update dhcp (serv), hostnames, enable junbo

---
 salt-pillar/bind/dns.sls        | 2 +-
 salt-pillar/dhcp/init.sls       | 2 +-
 salt-pillar/hosts/init.sls      | 3 ++-
 salt-pillar/switches/init.sls   | 2 +-
 salt/switches/3com-4200G.expect | 2 ++
 salt/switches/init.sls          | 1 +
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/salt-pillar/bind/dns.sls b/salt-pillar/bind/dns.sls
index 745ec18..a6e9b77 100644
--- a/salt-pillar/bind/dns.sls
+++ b/salt-pillar/bind/dns.sls
@@ -17,7 +17,7 @@ bind:
     # dns.spaceboyz.net
     - 172.22.24.4
     - 2a01:4f8:a0:33d0::4
-  serial: 2019071703
+  serial: 2019081501
   
   reverse-zones-inet:
     - 72.20.172.in-addr.arpa
diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls
index fa1630d..045058a 100644
--- a/salt-pillar/dhcp/init.sls
+++ b/salt-pillar/dhcp/init.sls
@@ -2,7 +2,7 @@ dhcp:
   serv:
     start: 172.20.73.2
     end: 172.20.73.63
-    time: 300
+    time: 604800
     max-time: 31536000
     opts:
       domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index 2c98fa8..9339d5e 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -78,6 +78,7 @@ hosts-inet:
     ap63: 10.0.0.103
     ap64: 10.0.0.104
     monit: 10.0.0.250
+    logging: 10.0.0.251
     mgmt-gw: 10.0.0.254
 
   core:
@@ -146,7 +147,7 @@ hosts-inet:
     elastic1: 172.20.73.15
     logging: 172.20.73.13
     dnscache: 172.20.73.8
-    mongo: 172.20.73.14
+    mongo: 172.20.73.21
     ipa: 172.20.73.20
   priv1:
     priv1-gw: 172.20.74.1
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 342c510..c3aa9f2 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -407,6 +407,7 @@ switches:
           - serv
           - c3d2
           - radio
+          - priv23
       ap24:
         mode: trunk
         ports:
@@ -495,7 +496,6 @@ switches:
         ports: 21-24
         vlans:
           - mgmt
-          - core
           - pub
           - c3d2
           - up1
diff --git a/salt/switches/3com-4200G.expect b/salt/switches/3com-4200G.expect
index 19473dc..8c4812b 100644
--- a/salt/switches/3com-4200G.expect
+++ b/salt/switches/3com-4200G.expect
@@ -64,6 +64,8 @@ send "lacp enable\r"
 send "undo lacp enable\r"
 {%-       endif %}
 expect "]"
+send "jumboframe enable\r"
+expect "]"
 {%-       if conf.get('vlans') %}
 send "port link-type trunk\r"
 expect "]"
diff --git a/salt/switches/init.sls b/salt/switches/init.sls
index 94ae63e..b331e0c 100644
--- a/salt/switches/init.sls
+++ b/salt/switches/init.sls
@@ -6,6 +6,7 @@
     - context:
         hostname: {{ hostname }}
         switch: {{ switch }}
+        logging: {{ pillar['hosts-inet']['mgmt']['logging'] }}
     - mode: 755
 
 {%- endfor %}