Some fixes for old and broken Makefile targets + Updates. (#113)

Author: Gerrit91

.gitignore

@@ -4,6 +4,7 @@
 **/*.pyc
 clab-mini-lab
 .mini-lab.clab.yml
+.mini-lab.cumulus.yml
 ansible-common
 metal-hammer*
 requirements.yaml

Makefile

@@ -153,23 +153,6 @@ ssh-leaf02:
 start-machines:
 	docker exec vms /mini-lab/manage_vms.py --names $(LAB_MACHINES) create
 
-.PHONY: _reboot-machine
-_reboot-machine:
-	docker exec vms /mini-lab/manage_vms.py --names $(MACHINE_NAME) kill
-	docker exec vms /mini-lab/manage_vms.py --names $(MACHINE_NAME) create
-
-.PHONY: reboot-machine01
-reboot-machine01:
-	@$(MAKE)	--no-print-directory	_reboot-machine	MACHINE_NAME=machine01
-
-.PHONY: reboot-machine02
-reboot-machine02:
-	@$(MAKE)	--no-print-directory	_reboot-machine	MACHINE_NAME=machine02
-
-.PHONY: reboot-machine03
-reboot-machine03:
-	@$(MAKE)	--no-print-directory	_reboot-machine	MACHINE_NAME=machine03
-
 .PHONY: _password
 _password: env
 	$(DOCKER_COMPOSE) run $(DOCKER_COMPOSE_TTY_ARG) metalctl machine consolepassword $(MACHINE_UUID)
@@ -189,19 +172,20 @@ password-machine03:
 .PHONY: _free-machine
 _free-machine: env
 	$(DOCKER_COMPOSE) run $(DOCKER_COMPOSE_TTY_ARG) metalctl machine rm $(MACHINE_UUID)
-	@$(MAKE) --no-print-directory reboot-machine	MACHINE_NAME=$(MACHINE_NAME)
+	docker exec vms /mini-lab/manage_vms.py --names $(MACHINE_NAME) kill --with-disks
+	docker exec vms /mini-lab/manage_vms.py --names $(MACHINE_NAME) create
 
 .PHONY: free-machine01
 free-machine01:
-	@$(MAKE) --no-print-directory _free-machine	MACHINE_NAME=machine01
+	@$(MAKE) --no-print-directory _free-machine	MACHINE_NAME=machine01 MACHINE_UUID=e0ab02d2-27cd-5a5e-8efc-080ba80cf258
 
 .PHONY: free-machine02
 free-machine02:
-	@$(MAKE) --no-print-directory _free-machine	MACHINE_NAME=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
+	@$(MAKE) --no-print-directory _free-machine	MACHINE_NAME=machine03 MACHINE_UUID=2a92f14d-d3b1-4d46-b813-5d058103743e
 
 .PHONY: _console-machine
 _console-machine:

README.md

@@ -32,9 +32,9 @@ Here is some code that should help you to set up most of the requirements:
 
  ```bash
 # If UFW enabled.
-# Disable the firewall or allow traffic through Docker network IP range. 
+# Disable the firewall or allow traffic through Docker network IP range.
 sudo ufw status
-sudo ufw allow from 172.17.0.0/16 
+sudo ufw allow from 172.17.0.0/16
 
 # Install kvm
 sudo apt install -y git curl qemu qemu-kvm haveged
@@ -201,7 +201,7 @@ docker-compose run --rm metalctl machine reinstall \
 
 ### Free machine
 
-Free a machine with
+Free a machine with `make free-machine01` or
 
 ```bash
 docker-compose run --rm metalctl machine rm e0ab02d2-27cd-5a5e-8efc-080ba80cf258
@@ -221,4 +221,3 @@ In order to start specific flavor, you can define the flavor as follows:
 export MINI_LAB_FLAVOR=cluster-api
 make
 ```
-

inventories/group_vars/all/images.yaml

@@ -1,5 +1,5 @@
 ---
-metal_stack_release_version: v0.11.0
+metal_stack_release_version: v0.11.4
 
 ##
 ## for development purposes, you can override releases from our image vector here

inventories/group_vars/control-plane/metal.yml

@@ -12,16 +12,16 @@ metal_api_admin_key: metal-admin
 metal_api_nsq_tcp_address: nsqd:4150
 
 metal_api_images:
-- id: firewall-ubuntu-2.0.20220830
-  name: Firewall 2 Ubuntu 20220830
-  description: Firewall 2 Ubuntu 20220830
-  url: http://images.metal-stack.io/metal-os/firewall/2.0-ubuntu/20220830/img.tar.lz4
+- id: firewall-ubuntu-2.0.20230110
+  name: Firewall 2 Ubuntu 20230110
+  description: Firewall 2 Ubuntu 20230110
+  url: http://images.metal-stack.io/metal-os/firewall/2.0-ubuntu/20230110/img.tar.lz4
   features:
     - firewall
-- id: ubuntu-20.04.20220830
-  name: Ubuntu 20.04 20220830
-  description: Ubuntu 20.04 20220830
-  url: http://images.metal-stack.io/metal-os/ubuntu/20.04/20220830/img.tar.lz4
+- id: ubuntu-20.04.20230110
+  name: Ubuntu 20.04 20230110
+  description: Ubuntu 20.04 20230110
+  url: http://images.metal-stack.io/metal-os/ubuntu/20.04/20230110/img.tar.lz4
   features:
     - machine
 

scripts/manage_vms.py

@@ -48,6 +48,7 @@ def parse_args():
 
     kill = subparsers.add_parser('kill', help='kills vm processes')
     kill.set_defaults(entry_function="kill")
+    kill.add_argument("--with-disks", default=False, action='store_true', help="also deletes the vm's disks")
 
     return parser.parse_args()
 
@@ -58,6 +59,7 @@ def __init__(self, args):
         self.names = []
         if args.names:
             self.names = args.names.split(",")
+        self.with_disks = args.with_disks if 'with_disks' in args else False
 
     def run(self):
         subcommands = {
@@ -92,6 +94,8 @@ def _create(self):
     def _kill(self):
         for machine in self._machines_from_cmdline():
             Manager._kill_vm_process(machine.get("uuid"))
+            if self.with_disks:
+                Manager._delete_vm_disk(machine.get("disk-path"))
 
 
     @staticmethod
@@ -113,6 +117,13 @@ def _create_vm_disk(path, size):
             return
         subprocess.run(['qemu-img', 'create', '-f', 'qcow2', path, size])
 
+    @staticmethod
+    def _delete_vm_disk(path):
+        if not os.path.isfile(path):
+            print("disk does not exist")
+            return
+        os.remove(path)
+
     @staticmethod
     def _start_vm(machine):
         nics = []
@@ -136,7 +147,7 @@ def _start_vm(machine):
             "-cpu", "host",
             "-drive", "if=virtio,format=qcow2,file={disk}".format(disk=machine.get("disk-path")),
             "-drive", "if=pflash,format=raw,readonly,file=/usr/share/OVMF/OVMF_CODE.fd",
-            "-drive", "if=pflash,format=raw,file=/usr/share/OVMF/OVMF_VARS.fd",
+            "-drive", "if=pflash,format=raw,readonly,file=/usr/share/OVMF/OVMF_VARS.fd",
             "-serial", "telnet:127.0.0.1:{port},server,nowait".format(port=machine.get("serial-port")),
             "-enable-kvm",
             "-nographic",