Remove Cumulus (#246)

Author: robertvolkmann

.github/workflows/integration.yaml

@@ -93,7 +93,6 @@ jobs:
     strategy:
       matrix:
         flavors:
-          - name: cumulus
           - name: sonic
           - name: gardener
 

.gitignore

@@ -5,7 +5,6 @@
 **/*.pyc
 clab-mini-lab
 .mini-lab.clab.yml
-.mini-lab.cumulus.yml
 .mini-lab.sonic.yml
 ansible-common
 metal-hammer*

Makefile

@@ -27,22 +27,15 @@ MACHINE_OS=debian-12.0
 MAX_RETRIES := 30
 
 # Machine flavors
-ifeq ($(MINI_LAB_FLAVOR),cumulus)
-MACHINE_OS=ubuntu-24.4
-LAB_TOPOLOGY=mini-lab.cumulus.yaml
-VRF=vrf20
-else ifeq ($(MINI_LAB_FLAVOR),sonic)
+ifeq ($(MINI_LAB_FLAVOR),sonic)
 LAB_TOPOLOGY=mini-lab.sonic.yaml
-VRF=Vrf20
 else ifeq ($(MINI_LAB_FLAVOR),capms)
 LAB_TOPOLOGY=mini-lab.capms.yaml
-VRF=Vrf20
 else ifeq ($(MINI_LAB_FLAVOR),gardener)
 GARDENER_ENABLED=true
 # usually gardener restricts the maximum version for k8s:
 K8S_VERSION=1.32.5
 LAB_TOPOLOGY=mini-lab.sonic.yaml
-VRF=Vrf20
 else
 $(error Unknown flavor $(MINI_LAB_FLAVOR))
 endif
@@ -116,9 +109,7 @@ partition: partition-bake
 .PHONY: partition-bake
 partition-bake: external_network
 	docker pull $(MINI_LAB_VM_IMAGE)
-ifneq ($(MINI_LAB_FLAVOR),cumulus)
 	docker pull $(MINI_LAB_SONIC_IMAGE)
-endif
 	@if ! sudo $(CONTAINERLAB) --topo $(LAB_TOPOLOGY) inspect | grep -i leaf01 > /dev/null; then \
 		sudo --preserve-env $(CONTAINERLAB) deploy --topo $(LAB_TOPOLOGY) --reconfigure && \
 		./scripts/deactivate_offloading.sh; fi
@@ -157,7 +148,6 @@ cleanup-control-plane:
 .PHONY: cleanup-partition
 cleanup-partition:
 	mkdir -p clab-mini-lab
-	sudo --preserve-env $(CONTAINERLAB) destroy --topo mini-lab.cumulus.yaml
 	sudo --preserve-env $(CONTAINERLAB) destroy --topo mini-lab.sonic.yaml
 	sudo --preserve-env $(CONTAINERLAB) destroy --topo mini-lab.capms.yaml
 	docker network rm --force mini_lab_ext
@@ -316,14 +306,14 @@ password-machine0%:
 .PHONY: ssh-firewall
 ssh-firewall:
 	$(eval fw = $(shell ssh -F files/ssh/config leaf01 "vtysh -c 'show bgp neighbors fw json' | \
-		python3 -c 'import sys, json; data = json.load(sys.stdin); key = next(iter(data)); print(data[key][\"bgpNeighborAddr\"] + \"%\" + key)'" \
+		jq -r 'to_entries[0] | .value.bgpNeighborAddr + \"%\" + .key'" \
 	))
 	ssh -F files/ssh/config $(fw) $(COMMAND)
 
 .PHONY: ssh-machine
 ssh-machine:
-	$(eval machine = $(shell ssh -F files/ssh/config leaf01 "vtysh -c 'show bgp vrf $(VRF) neighbors test json' | \
-		python3 -c 'import sys, json; data = json.load(sys.stdin); key = next(iter(data)); print(data[key][\"bgpNeighborAddr\"] + \"%\" + key)'" \
+	$(eval machine = $(shell ssh -F files/ssh/config leaf01 "vtysh -c 'show bgp vrf Vrf20 neighbors test json' | \
+		jq -r 'to_entries[0] | .value.bgpNeighborAddr + \"%\" + .key'" \
 	))
 	ssh -F files/ssh/config $(machine) $(COMMAND)
 

README.md

@@ -190,7 +190,6 @@ make power-<on,reset,off>-<machine name>
 
 There are two versions, or flavors, of the mini-lab environment which differ in regards to the NOS running on the leaves:
 
-- `cumulus`: runs 2 Cumulus switches.
 - `sonic`: runs 2 SONiC switches
 - `capms`: runs the SONiC flavor but with three instead of two machines (this is used for  [cluster-provider-metal-stack](https://github.com/metal-stack/cluster-api-provider-metal-stack) in order to have dedicated hosts for control plane / worker / firewall)
 - `gardener`: installs the [Gardener](https://gardener.cloud) in the mini-lab

apt-transport-https.tar.gz

@@ -1,6 +1,6 @@
 ---
-- name: Configure SONiC switches
-  hosts: leaves:&sonic
+- name: Configure leaves
+  hosts: leaves
   any_errors_fatal: true
   gather_facts: false
   pre_tasks:
@@ -16,43 +16,6 @@
     - name: sonic
       tags: sonic
 
-- name: Configure Cumulus switches
-  hosts: leaves:&cumulus
-  any_errors_fatal: true
-  pre_tasks:
-    # the following task is not required as long as we do not install something from the cumulus repositories, for which all the keys are expired now
-    # the one from here has also expired on 9th Apr 2024: https://docs.nvidia.com/networking-ethernet-software/knowledge-base/Installing-and-Upgrading/Upgrading/Update-Expired-GPG-Keys/#package-upgrade-from-cumulus-linux-37x-to-3716
-    # - name: update cumulus repo key
-    #   apt_key:
-    #     url: http://repo3.cumulusnetworks.com/public-key/repo3-2023-key
-    #     validate_certs: false
-    #     state: present
-    - name: unpack jessie fixes
-      command: tar xf /root/jessie-apt-transport-fix.tar.gz
-    - name: install apt-transport
-      shell: dpkg -i /root/https-deps/*.deb && apt-get install -fy
-    - name: use own repo mirrors (old ones are 404)
-      copy:
-        dest: /etc/apt/sources.list
-        content: |
-          deb https://cumulus-3.apt.metal-stack.io/cumulus CumulusLinux-3 main
-          deb-src https://cumulus-3.apt.metal-stack.io/cumulus CumulusLinux-3 main
-
-          deb https://cumulus-3.apt.metal-stack.io/cumulus-updates CumulusLinux-3-updates main
-          deb-src https://cumulus-3.apt.metal-stack.io/cumulus-updates CumulusLinux-3-updates main
-
-          deb https://cumulus-3.apt.metal-stack.io/cumulus-security-updates CumulusLinux-3-security-updates main
-          deb-src https://cumulus-3.apt.metal-stack.io/cumulus-security-updates CumulusLinux-3-security-updates main
-    - name: set resolv.conf
-      shell: rm /etc/resolv.conf && echo 'nameserver 8.8.8.8' > /etc/resolv.conf
-    - name: use own repo key
-      shell: curl -fsSL https://cumulus-3.apt.metal-stack.io/cumulus-3-repo.gpg | apt-key add -
-  roles:
-    - name: cumulus
-      tags: cumulus
-    - name: metal-roles/partition/roles/docker-on-cumulus
-      tags: docker-on-cumulus
-
 - name: Deploy dhcp server and pixiecore on leaf01
   hosts: leaf01
   roles:

deploy_partition.yaml

@@ -10,5 +10,4 @@ Host *
     PubkeyAcceptedKeyTypes +ssh-rsa
 
 Host fe80::*
-    # bash could be replaced with ncat, but it is not preinstalled on Cumulus
-    ProxyCommand ssh -q -F files/ssh/config leaf01 'sudo ip vrf exec default bash -c "exec 3<>/dev/tcp/%h/%p; cat<&0 >&3 & cat<&3 >&1"'
+    ProxyCommand ssh -q -F files/ssh/config leaf01 'bash -c "exec 3<>/dev/tcp/%h/%p; cat<&0 >&3 & cat<&3 >&1"'

files/ssh/config

@@ -28,15 +28,11 @@ topology:
     leaf01:
       group: leaves
       image: ${MINI_LAB_SONIC_IMAGE}
-      labels:
-        ansible-group: sonic
       binds:
         - files/ssh/id_rsa.pub:/authorized_keys
     leaf02:
       group: leaves
       image: ${MINI_LAB_SONIC_IMAGE}
-      labels:
-        ansible-group: sonic
       binds:
         - files/ssh/id_rsa.pub:/authorized_keys
     machine01: