From cb3e779fb45b080147980281c410abb8bb1f36d9 Mon Sep 17 00:00:00 2001
From: Joshua Hoblitt <josh@hoblitt.com>
Date: Fri, 11 Dec 2020 11:22:20 -0700
Subject: [PATCH] rm bond0 on amor

---
 hieradata/cluster/amor.yaml            | 27 ++++++++++++--------------
 hieradata/node/amor01.cp.lsst.org.yaml |  2 +-
 hieradata/node/amor02.cp.lsst.org.yaml |  2 +-
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/hieradata/cluster/amor.yaml b/hieradata/cluster/amor.yaml
index bca71916a2..69ab65ed22 100644
--- a/hieradata/cluster/amor.yaml
+++ b/hieradata/cluster/amor.yaml
@@ -3,6 +3,7 @@ network::interfaces_hash:
   em1:  # fqdn
     bootproto: "dhcp"
     defroute: "yes"
+    nozeroconf: "yes"
     onboot: "yes"
     type: "Ethernet"
   em2:  # not connected
@@ -11,30 +12,26 @@ network::interfaces_hash:
     type: "Ethernet"
   p2p1:
     bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    onboot: "yes"
-    hwaddr: "%{facts.networking.interfaces.p2p1.mac}"
-  p2p2:
-    bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    onboot: "yes"
-    hwaddr: "%{facts.networking.interfaces.p2p2.mac}"
-  bond0:
-    bonding_master: "yes"
-    bonding_opts: "mode=4 miimon=100"
     bootproto: "none"
     defroute: "no"
     netmask: "255.255.255.0"
     onboot: "yes"
-    type: "Bond"
+    onboot: "yes"
+  p2p2:  # not connected; was bond0
+    bootproto: "none"
+    onboot: "no"
+    type: "Ethernet"
+  bond0:
+    ensure: "absent"
 
 network::mroutes_hash:
-  bond0:
+  p2p1:
     routes:
       "139.229.147.0/24": "139.229.170.254"
       "139.229.166.0/24": "139.229.170.254"
       "139.229.167.0/24": "139.229.170.254"
       #"139.229.170.0/24": "139.229.170.254"
       "139.229.178.0/24": "139.229.170.254"
+  bond0:
+    ensure: "absent"
+    routes: {}
diff --git a/hieradata/node/amor01.cp.lsst.org.yaml b/hieradata/node/amor01.cp.lsst.org.yaml
index 81c5fb0f0d..e833fbf402 100644
--- a/hieradata/node/amor01.cp.lsst.org.yaml
+++ b/hieradata/node/amor01.cp.lsst.org.yaml
@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
-  bond0:
+  p2p1:
     ipaddress: "139.229.170.36"
diff --git a/hieradata/node/amor02.cp.lsst.org.yaml b/hieradata/node/amor02.cp.lsst.org.yaml
index 3e2a1c646e..a83b522869 100644
--- a/hieradata/node/amor02.cp.lsst.org.yaml
+++ b/hieradata/node/amor02.cp.lsst.org.yaml
@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
-  bond0:
+  p2p1:
     ipaddress: "139.229.170.37"