Merge pull request #274 from lsst-it/IT-2671/rm-bond

rm andes bond0
lsst-it · Dec 11, 2020 · 3af60ca · 3af60ca
2 parents a5efaed + 04fd208
commit 3af60ca
Show file tree

Hide file tree

Showing 13 changed files with 123 additions and 97 deletions.
diff --git a/hieradata/cluster/amor.yaml b/hieradata/cluster/amor.yaml
@@ -3,38 +3,33 @@ network::interfaces_hash:
   em1:  # fqdn
     bootproto: "dhcp"
     defroute: "yes"
+    nozeroconf: "yes"
     onboot: "yes"
     type: "Ethernet"
   em2:  # not connected
     bootproto: "none"
     onboot: "no"
     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"
+  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/cluster/andes.yaml b/hieradata/cluster/andes.yaml
@@ -5,54 +5,53 @@ network::interfaces_hash:
   em1:  # fqdn
     bootproto: "dhcp"
     defroute: "yes"
+    nozeroconf: "yes"
     onboot: "yes"
     type: "Ethernet"
   em2:  # not connected
     bootproto: "none"
     onboot: "no"
     type: "Ethernet"
-  p2p1:
-    bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
-  p2p1.1300:
-    ensure: "absent"
-  p2p1.1301:
-    ensure: "absent"
-  p2p2:
-    bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
-  bond0:
-    type: "Bond"
+  p2p1:  # trunk
     bootproto: "none"
-    bonding_opts: "mode=4 miimon=100"
-    bonding_master: "yes"
-    nm_controlled: "no"
-  bond0.1201:  # 139.229.166.0/24
+    onboot: "yes"
+    type: "Ethernet"
+  p2p1.1201:  # 139.229.166.0/24
     bootproto: "none"
     defroute: "no"
     netmask: "255.255.255.0"
     nozeroconf: "yes"
     onboot: "yes"
     type: "none"
     vlan: "yes"
-  bond0.1400:  # 139.229.170.0/24
+  p2p1.1400:  # 139.229.170.0/24
     bootproto: "none"
     defroute: "no"
     netmask: "255.255.255.0"
     nozeroconf: "yes"
     onboot: "yes"
     type: "none"
     vlan: "yes"
+  p2p1.1300:
+    ensure: "absent"
+  p2p1.1301:
+    ensure: "absent"
+  p2p2:  # not connected; was bond0
+    bootproto: "none"
+    onboot: "no"
+    type: "Ethernet"
+  bond0:
+    ensure: "absent"
+  bond0.1201:
+    ensure: "absent"
   bond0.1300:
     ensure: "absent"
   bond0.1301:
     ensure: "absent"
-network::mroutes_hash:
   bond0.1400:
+    ensure: "absent"
+network::mroutes_hash:
+  p2p1.1400:
     routes:
       "139.229.147.0/24": "139.229.170.254"
       #"139.229.166.0/24": "139.229.170.254"
@@ -68,6 +67,9 @@ network::mroutes_hash:
   bond0.1301:
     ensure: "absent"
     routes: {}
+  bond0.1400:
+    ensure: "absent"
+    routes: {}
 yum::managed_repos:
   - "dell"
 yum::repos:

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"
diff --git a/hieradata/node/andes01.cp.lsst.org.yaml b/hieradata/node/andes01.cp.lsst.org.yaml
@@ -1,6 +1,6 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
+  p2p1.1201:
     ipaddress: "139.229.166.4"
-  bond0.1400:
+  p2p1.1400:
     ipaddress: "139.229.170.11"
diff --git a/hieradata/node/andes02.cp.lsst.org.yaml b/hieradata/node/andes02.cp.lsst.org.yaml
@@ -1,6 +1,6 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
+  p2p1.1201:
     ipaddress: "139.229.166.5"
-  bond0.1400:
+  p2p1.1400:
     ipaddress: "139.229.170.12"
diff --git a/hieradata/node/andes03.cp.lsst.org.yaml b/hieradata/node/andes03.cp.lsst.org.yaml
@@ -1,6 +1,6 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
+  p2p1.1201:
     ipaddress: "139.229.166.6"
-  bond0.1400:
+  p2p1.1400:
     ipaddress: "139.229.170.13"
diff --git a/hieradata/node/andes04.cp.lsst.org.yaml b/hieradata/node/andes04.cp.lsst.org.yaml
@@ -1,20 +1,40 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
-    ipaddress: "139.229.166.7"
-  bond0.1400:
-    ipaddress: "139.229.170.14"
-  enp59s0f0:
+  enp59s0f0:  # trunk
+    bootproto: "none"
+    onboot: "yes"
+    type: "Ethernet"
+  enp59s0f1:  # not connected; was bond0
     bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
-  enp59s0f1:
+    onboot: "no"
+    type: "Ethernet"
+  enp59s0f0.1201:  # 139.229.166.0/24
     bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
+    defroute: "no"
+    ipaddress: "139.229.166.7"
+    netmask: "255.255.255.0"
+    nozeroconf: "yes"
+    onboot: "yes"
+    type: "none"
+    vlan: "yes"
+  enp59s0f0.1400:  # 139.229.170.0/24
+    bootproto: "none"
+    defroute: "no"
+    ipaddress: "139.229.170.14"
+    netmask: "255.255.255.0"
+    nozeroconf: "yes"
+    onboot: "yes"
+    type: "none"
+    vlan: "yes"
   p2p1:
     ensure: "absent"
   p2p2:
     ensure: "absent"
+network::mroutes_hash:
+  enp59s0f0.1400:
+    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"
diff --git a/hieradata/node/andes05.cp.lsst.org.yaml b/hieradata/node/andes05.cp.lsst.org.yaml
@@ -1,6 +1,6 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
+  p2p1.1201:
     ipaddress: "139.229.166.8"
-  bond0.1400:
+  p2p1.1400:
     ipaddress: "139.229.170.15"
diff --git a/hieradata/node/andes06.cp.lsst.org.yaml b/hieradata/node/andes06.cp.lsst.org.yaml
@@ -1,6 +1,6 @@
 ---
 network::interfaces_hash:
-  bond0.1201:
+  p2p1.1201:
     ipaddress: "139.229.166.9"
-  bond0.1400:
+  p2p1.1400:
     ipaddress: "139.229.170.16"
diff --git a/hieradata/node/atarchiver.cp.lsst.org.yaml b/hieradata/node/atarchiver.cp.lsst.org.yaml
@@ -1,15 +1,15 @@
 ---
 network::interfaces_hash:
-  em1:  # bond0
-    bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
-  em2:  # bond0
+  em1:  # fqdn; was bond0
+    bootproto: "dhcp"
+    defroute: "yes"
+    nozeroconf: "yes"
+    onboot: "yes"
+    type: "Ethernet"
+  em2:  # trunk; was bond0
     bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
+    onboot: "yes"
+    type: "Ethernet"
   em3:  # not connected
     bootproto: "none"
     onboot: "no"
@@ -26,22 +26,32 @@ network::interfaces_hash:
     bootproto: "none"
     onboot: "no"
     type: "Ethernet"
-  bond0:  # fqdn
-    bonding_master: "yes"
-    bonding_opts: "mode=4 miimon=100"
-    bootproto: "dhcp"
-    defroute: "yes"
-    nm_controlled: "no"
-    nozeroconf: "yes"
-    type: "Bond"
-  bond0.1201:  # 139.229.166.0/24
+  em2.1201:  # 139.229.166.0/24
     bootproto: "none"
     ipaddress: "139.229.166.10"
     netmask: "255.255.255.0"
     nozeroconf: "yes"
     onboot: "yes"
     type: "none"
     vlan: "yes"
+  bond0:
+    ensure: "absent"
+  bond0.1201:
+    ensure: "absent"
+network::mroutes_hash:
+  p2p1.1400:
+    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: {}
+  bond0.1201:
+    ensure: "absent"
+    routes: {}
 
 # 139.229.146.0/24    antu
 # 139.229.160.0/24    cp general & andes

diff --git a/hieradata/node/eas-master.cp.lsst.org.yaml b/hieradata/node/eas-master.cp.lsst.org.yaml
@@ -3,35 +3,34 @@ network::interfaces_hash:
   em1:  # fqdn
     bootproto: "dhcp"
     defroute: "yes"
+    nozeroconf: "yes"
     onboot: "yes"
     type: "Ethernet"
   em2:  # not connected
     bootproto: "none"
     onboot: "no"
     type: "Ethernet"
-  p2p1:  # bond0
-    bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
-  p2p2:  # bond0
-    bootproto: "none"
-    master: "bond0"
-    slave: "yes"
-    nm_controlled: "no"
-  bond0:  # dds -- could be changed to dhcp?
-    type: "Bond"
+  p2p1:  # 139.229.170.0/24
     bootproto: "none"
+    defroute: "no"
     ipaddress: "139.229.178.59"
     netmask: "255.255.255.0"
-    bonding_opts: "mode=4 miimon=100"
-    bonding_master: "yes"
-    nm_controlled: "no"
-network::mroutes_hash:
+    onboot: "yes"
+    type: "Ethernet"
+  p2p2:  # no connected; was bond0
+    bootproto: "none"
+    onboot: "no"
+    type: "Ethernet"
   bond0:
+    ensure: "absent"
+network::mroutes_hash:
+  p2p1:
     routes:
       "139.229.147.0/24": "139.229.178.254"
       "139.229.166.0/24": "139.229.178.254"
       "139.229.167.0/24": "139.229.178.254"
       "139.229.170.0/24": "139.229.178.254"
       #"139.229.178.0/24": "139.229.178.254"
+  bond0:
+    ensure: "absent"
+    routes: {}
diff --git a/hieradata/org/lsst/role/amor.yaml b/hieradata/org/lsst/role/amor.yaml
@@ -12,7 +12,7 @@ docker::networks::networks:
     driver: "macvlan"
     subnet: "139.229.170.0/24"
     gateway: "139.229.170.254"
-    options: ["parent=bond0"]
+    options: ["parent=p2p1"]
 
 # disabling the kernel version check is needed on el7
 docker::overlay2_override_kernel_check: true