remove third unused machine

metal-stack · Sep 19, 2024 · 909c781 · 909c781
1 parent a9e8c77
commit 909c781
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -184,10 +184,6 @@ password-machine01:
 password-machine02:
 	@$(MAKE)	--no-print-directory	_password	MACHINE_UUID=2294c949-88f6-5390-8154-fa53d93a3313
 
-.PHONY: password-machine03
-password-machine03:
-	@$(MAKE)	--no-print-directory	_password	MACHINE_UUID=2a92f14d-d3b1-4d46-b813-5d058103743e
-
 .PHONY: _free-machine
 _free-machine: env
 	docker compose run $(DOCKER_COMPOSE_TTY_ARG) metalctl machine rm $(MACHINE_UUID)
@@ -202,10 +198,6 @@ free-machine01:
 free-machine02:
 	@$(MAKE) --no-print-directory _free-machine	MACHINE_NAME=machine02 MACHINE_UUID=2294c949-88f6-5390-8154-fa53d93a3313
 
-.PHONY: free-machine03
-free-machine03:
-	@$(MAKE) --no-print-directory _free-machine	MACHINE_NAME=machine03 MACHINE_UUID=2a92f14d-d3b1-4d46-b813-5d058103743e
-
 .PHONY: _console-machine
 _console-machine:
 	@echo "exit console with CTRL+5 and then quit telnet through q + ENTER"
@@ -219,10 +211,6 @@ console-machine01:
 console-machine02:
 	@$(MAKE) --no-print-directory _console-machine	CONSOLE_PORT=4001
 
-.PHONY: console-machine03
-console-machine03:
-	@$(MAKE) --no-print-directory _console-machine	CONSOLE_PORT=4002
-
 ## SSH TARGETS FOR MACHINES ##
 # Python code could be replaced by jq, but it is not preinstalled on Cumulus
 .PHONY: ssh-firewall

diff --git a/README.md b/README.md
@@ -193,15 +193,14 @@ docker compose run --rm metalctl machine rm e0ab02d2-27cd-5a5e-8efc-080ba80cf258
 
 ## Flavors
 
-There's few versions of mini-lab environment that you can run. We call them flavors. There's 2 flavors at the moment:
+There are three versions, or flavors, of the mini-lab environment which differ in regards to the NOS running on the leaves:
 
-- `default` -- runs 2 machines.
-- `cluster-api` -- runs 3 machines. Useful for testing Control plane and worker node deployment with [Cluster API provider](https://github.com/metal-stack/cluster-api-provider-metalstack).
-- `sonic` -- use SONiC as network operating system for the leaves
+- `cumulus` -- runs 2 Cumulus switches.
+- `sonic` -- runs 2 SONiC switches
 
 In order to start specific flavor, you can define the flavor as follows:
 
 ```bash
-export MINI_LAB_FLAVOR=cluster-api
+export MINI_LAB_FLAVOR=sonic
 make
 ```
diff --git a/mini-lab.cumulus.yaml b/mini-lab.cumulus.yaml
@@ -53,7 +53,5 @@ topology:
     - endpoints: ["leaf02:swp1", "vms:lan1"]
     - endpoints: ["leaf01:swp2", "vms:lan2"]
     - endpoints: ["leaf02:swp2", "vms:lan3"]
-    - endpoints: ["leaf01:swp3", "vms:lan4"]
-    - endpoints: ["leaf02:swp3", "vms:lan5"]
     - endpoints: ["leaf01:swp31", "inet:eth1"]
     - endpoints: ["leaf02:swp31", "inet:eth2"]
diff --git a/mini-lab.sonic.yaml b/mini-lab.sonic.yaml
@@ -55,7 +55,5 @@ topology:
     - endpoints: ["leaf02:eth1", "inet:eth2"]
     - endpoints: ["leaf01:eth2", "vms:lan0"]
     - endpoints: ["leaf02:eth2", "vms:lan1"]
-    - endpoints: ["leaf01:eth3", "vms:lan2"]
-    - endpoints: ["leaf02:eth3", "vms:lan3"]
     - endpoints: ["leaf01:eth4", "vms:lan4"]
     - endpoints: ["leaf02:eth4", "vms:lan5"]
diff --git a/scripts/manage_vms.py b/scripts/manage_vms.py
@@ -25,15 +25,6 @@
         "lan_indices": [2, 3],
         "serial-port": 4001,
     },
-    "machine03": {
-        "name": "machine03",
-        "uuid": "2a92f14d-d3b1-4d46-b813-5d058103743e",
-        "disk-path": "/machine03.img",
-        "disk-size": "5G",
-        "memory": "2G",
-        "lan_indices": [4, 5],
-        "serial-port": 4002,
-    },
 }