rm bond0 on amor

lsst-it · Dec 11, 2020 · cb3e779 · cb3e779
1 parent 5bab109
commit cb3e779
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
 ---
 network::interfaces_hash:
-  bond0:
+  p2p1:
     ipaddress: "139.229.170.37"