commit recent changes

salt-pillar/lxc-containers/server1.sls

@@ -124,6 +124,7 @@ containers:
     interfaces:
       core:
         type: veth
+        hwaddr: 0A:14:48:01:26:00
       up1:
         type: phys
         # Change (eg. auto-generation) requires reboot of the cable
@@ -134,6 +135,7 @@ containers:
     interfaces:
       core:
         type: veth
+        hwaddr: 0A:14:48:01:27:00
       up2:
         type: phys
         # Change (eg. auto-generation) requires reboot of the cable

salt-pillar/switches/init.sls

@@ -197,6 +197,11 @@ switches:
           - GigabitEthernet1/0/11
           - GigabitEthernet1/0/12
         access: c3d2
+      c3d2-thinkbert:
+        mode: bond
+        ports:
+          - GigabitEthernet1/0/35
+        access: c3d2
       c3d2-storage:
         mode: bond
         ports:

salt/vpn/openvpn.sls

@@ -9,7 +9,7 @@ hostroutes-{{ name }}:
     - routes:
 {%- for a in salt.dnsutil.A(conf['server']) %}
       - ipaddr: {{ a }}
-        netmask: 255.255.255.255
+        netmask: 255.255.224.0
         gateway: {{ pillar['hosts-inet']['core']['upstream2'] }}
 {%- endfor %}