diff --git a/Makefile b/Makefile index 6b50d50c..76bb058b 100644 --- a/Makefile +++ b/Makefile @@ -245,10 +245,6 @@ power-on-machine01: power-on-machine02: @$(MAKE) --no-print-directory _ipmi_power VM=machine02 COMMAND=on -.PHONY: power-on-machine03 -power-on-machine03: - @$(MAKE) --no-print-directory _ipmi_power VM=machine03 COMMAND=on - .PHONY: power-reset-machine01 power-reset-machine01: @$(MAKE) --no-print-directory _ipmi_power VM=machine01 COMMAND=reset @@ -257,10 +253,6 @@ power-reset-machine01: power-reset-machine02: @$(MAKE) --no-print-directory _ipmi_power VM=machine02 COMMAND=reset -.PHONY: power-reset-machine03 -power-reset-machine03: - @$(MAKE) --no-print-directory _ipmi_power VM=machine03 COMMAND=reset - .PHONY: power-off-machine01 power-off-machine01: @$(MAKE) --no-print-directory _ipmi_power VM=machine01 COMMAND=off @@ -269,10 +261,6 @@ power-off-machine01: power-off-machine02: @$(MAKE) --no-print-directory _ipmi_power VM=machine02 COMMAND=off -.PHONY: power-off-machine03 -power-off-machine03: - @$(MAKE) --no-print-directory _ipmi_power VM=machine03 COMMAND=off - .PHONY: _console _console: docker exec --interactive --tty $(VM) ipmitool -C 3 -I lanplus -U ADMIN -P ADMIN -H 127.0.0.1 sol activate @@ -285,10 +273,6 @@ console-machine01: console-machine02: @$(MAKE) --no-print-directory _console VM=machine02 -.PHONY: console-machine03 -console-machine03: - @$(MAKE) --no-print-directory _console VM=machine03 - .PHONY: _password _password: env docker compose run $(DOCKER_COMPOSE_RUN_ARG) metalctl machine consolepassword $(MACHINE_UUID) diff --git a/inventories/group_vars/control-plane/dex.yaml b/inventories/group_vars/control-plane/dex.yaml index 6866f208..0cffda78 100644 --- a/inventories/group_vars/control-plane/dex.yaml +++ b/inventories/group_vars/control-plane/dex.yaml @@ -19,7 +19,3 @@ auth_dex_static_passwords: hash: "{{ 'change-me' | string | password_hash('bcrypt', salt='jKfnxzOP3oJPeZYXMOc00Y') }}" username: "editor" userID: "00000000-0000-0000-0000-000000000002" -- email: viewer@metal-stack.io - hash: "{{ 'change-me' | string | password_hash('bcrypt', salt='jKfnxzOP3oJPeZYXMOc00Y') }}" - username: "viewer" - userID: "00000000-0000-0000-0000-000000000003" diff --git a/mini-lab.capms.yaml b/mini-lab.capms.yaml index 00d3b123..47d6a86a 100644 --- a/mini-lab.capms.yaml +++ b/mini-lab.capms.yaml @@ -49,13 +49,6 @@ topology: QEMU_CPU_CORES: 2 QEMU_DISK_SIZE: 20G UUID: 00000000-0000-0000-0000-000000000002 - machine03: - group: machines - image: ${MINI_LAB_VM_IMAGE} - env: - QEMU_CPU_CORES: 2 - QEMU_DISK_SIZE: 20G - UUID: 00000000-0000-0000-0000-000000000003 links: - endpoints: ["exit:mini_lab_ext", "mini_lab_ext:exit"] mtu: 9000 @@ -63,7 +56,5 @@ topology: - endpoints: ["leaf02:Ethernet0", "machine01:lan1"] - endpoints: ["leaf01:Ethernet1", "machine02:lan0"] - endpoints: ["leaf02:Ethernet1", "machine02:lan1"] - - endpoints: ["leaf01:Ethernet2", "machine03:lan0"] - - endpoints: ["leaf02:Ethernet2", "machine03:lan1"] - endpoints: ["leaf01:Ethernet120", "exit:eth1"] - endpoints: ["leaf02:Ethernet120", "exit:eth2"]