From 3bb52c08c59034d620c2102e2dc1268662b6a14c Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 16 Nov 2016 22:47:26 +0100
Subject: [PATCH] add if-up.d/bond-slaves for reboot safety

---
 salt/bond-slaves         | 8 ++++++++
 salt/server1-network.sls | 7 +++++++
 2 files changed, 15 insertions(+)
 create mode 100644 salt/bond-slaves

diff --git a/salt/bond-slaves b/salt/bond-slaves
new file mode 100644
index 000000000..6cea459
--- /dev/null
+++ b/salt/bond-slaves
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+F=/sys/class/net/$IFACE/bonding/slaves
+[ -f "$F" ] || exit 0
+
+for slave in `cat "$F"`; do
+    ip link set $slave up
+done
diff --git a/salt/server1-network.sls b/salt/server1-network.sls
index 506705c..5dfa5db 100644
--- a/salt/server1-network.sls
+++ b/salt/server1-network.sls
@@ -1,6 +1,11 @@
 {%- import_yaml "netmasks.yaml" as netmasks -%}
 {% set bond_slaves = ['eno1', 'eno2', 'eno3', 'eno4'] %}
 
+/etc/network/if-up.d/bond-slaves:
+  file.managed:
+    - source: salt://bond-slaves
+    - mode: 744
+
 {% for slave in bond_slaves %}
 {{ slave }}:
   network.managed:
@@ -17,6 +22,8 @@ bond0:
       mode: 802.3ad
       slaves: {{ ' '.join(bond_slaves) }}
       miimon: 100
+      require:
+        - file: /etc/network/if-up.d/bond-slaves
 
 {% for name, vlan in pillar['vlans'].items() %}
 bond0.{{ vlan }}: