tidy up

ansible/playbooks/03_vm_deploy.yaml

@@ -6,13 +6,6 @@
   roles:
     - vm_deploy
 
-# - name: python bootstrap
-#   hosts: k8s
-#   gather_facts: false
-#   become: true
-#   roles:
-#     - python-install
-
 # - name: vm hardening
 #   hosts: k8s
 #   gather_facts: true

ansible/playbooks/04_k8s.yaml

@@ -1,10 +1,10 @@
 ---
-# - name: configure control plane
-#   hosts: k8s_control
-#   gather_facts: true
-#   become: true
-#   roles:
-#     - k8s_control
+- name: configure control plane
+  hosts: k8s_control
+  gather_facts: true
+  become: true
+  roles:
+    - k8s_control
 
 - name: configure calico networking
   hosts: localhost

ansible/playbooks/99_vm_destroy.yaml

@@ -4,19 +4,4 @@
   gather_facts: true
   become: true
   roles:
-    - vm_destroy
-
-# - name: python bootstrap
-#   hosts: k8s
-#   gather_facts: false
-#   become: true
-#   roles:
-#     - python-install
-
-# - name: vm hardening
-#   hosts: k8s
-#   gather_facts: true
-#   become: true
-#   roles:
-#     - sshd
-#     - firewall
+    - vm_destroy

ansible/roles/vm_destroy/defaults/main.yml

@@ -12,8 +12,8 @@ vm_cpu: "4"
 vm_cpu_cores: "2"
 vm_cpu_threads: "2"
 vm_bridge: "br1"
-vm_mac_prefix: "52:54:00:e3:af:"
-vm_subnet_prefix: "192.168.199.1" # vm suffix will be appended to this
+vm_mac_prefix: "52:54:00:e3:af:" # vm name suffix will be appended to this
+vm_subnet_prefix: "192.168.199.1" # vm name suffix will be appended to this
 vm_subnet_suffix: "/24"
 vm_gateway: "192.168.199.254"
 vm_ntp: "192.168.199.254"

ansible/roles/vm_destroy/tasks/destroy.yaml

@@ -26,11 +26,6 @@
       state: shutdown
       name: "{{ vm_name }}"
 
-  # - name: destroy the vm
-  #   community.libvirt.virt:
-  #     state: destroyed
-  #     name: "{{ vm_name }}"
-
   - name: delete the firmware vars file
     ansible.builtin.file:
       path: "{{ firmware_vhd_pool_dir }}/{{ vm_name }}_VARS.fd"

ansible/roles/vm_disks/tasks/main.yaml

@@ -1,6 +1,5 @@
 ---
 - name: install parted package
-  become: true
   community.general.pacman:
     name: parted
     state: latest