From f8f0e55fbb54a6b3b7cbe44c90f9d5a4a224654d Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lars@linux-schulserver.de>
Date: Jun 15 2020 13:45:55 +0000
Subject: Merge branch 'remove_254' into 'production'


remove the 192.168.254.x network references

See merge request infra/salt!231
---

diff --git a/pillar/role/ntp.sls b/pillar/role/ntp.sls
index 4182ec6..736ec40 100644
--- a/pillar/role/ntp.sls
+++ b/pillar/role/ntp.sls
@@ -4,7 +4,6 @@ chrony:
   allow:
     - 127.0.0.0/8
     - 192.168.47.0/24
-    - 192.168.254.0/24
   ntpservers:
     - ntp1.opensuse.org
     - ntp2.opensuse.org
diff --git a/pillar/role/proxy.sls b/pillar/role/proxy.sls
index 531c687..a1bbbd0 100644
--- a/pillar/role/proxy.sls
+++ b/pillar/role/proxy.sls
@@ -22,7 +22,6 @@ keepalived:
       promote_secondaries: ''
       smtp_alert: ''
       virtual_ipaddress:
-        - 192.168.254.4/24 dev private
         - 192.168.47.4/24 dev private
         - 172.16.42.103/24 dev login
         # proxy-nue.opensuse.org