Commit 02d15fb5 authored by Simon Cornet's avatar Simon Cornet
Browse files

feat: use builtin virtualisation detection

parent 6d269527

tasks/apk/packages.yaml

+3 −2
Original line number Diff line number Diff line
@@ -29,14 +29,15 @@ 
      community.general.apk:

        name: "qemu-guest-agent"

        state: "absent"

      when: 'type == "lxc"'

      when: "ansible_virtualization_type == 'lxc'"





    # install qemu-guest-agent

    - name: "install qemu-guest-agent"

      community.general.apk:

        name: "qemu-guest-agent"

        state: "present"

      when: 'type == "vm"'

      when: "ansible_virtualization_type == 'kvm'"



    # clean cache

    - name: "clean cache"

tasks/apt/cleanup.yaml

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
      ansible.builtin.command: "fstrim /"

      changed_when: false

      failed_when: false

      when: 'type == "vm"'
 
      when: "ansible_virtualization_type == 'kvm'"

tasks/apt/update.yaml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        cmd: "fstrim /"

      changed_when: false

      failed_when: false

      when: 'type == "vm"'

      when: "ansible_virtualization_type == 'kvm'"



    # check for reboots

    - name: "check if reboot required"

tasks/cron.yaml

+1 −1
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
    group: "root"

    mode: "0644"

  when:

    - 'type == "lxc"'

    - "ansible_os_family == 'Debian'"

    - "ansible_virtualization_type == 'lxc'"

  tags: "cron"



# configure cron

tasks/main.yaml

+7 −7
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ 
- name: "swap"

  ansible.builtin.import_tasks: "swap.yaml"

  when:

    - 'type == "vm"'

    - "ansible_os_family =='Debian'"

    - "ansible_virtualization_type == 'kvm'"

  tags: "swap"
@@ -116,7 +116,7 @@ 
# chrony

- name: "ntp"

  ansible.builtin.import_tasks: "ntp.yaml"

  when: 'type == "vm" or type == "hw"'

  when: "ansible_virtualization_type == 'kvm'"

  tags: "ntp"



# flush handler
@@ -140,8 +140,8 @@ 
- name: "lxd"

  ansible.builtin.import_tasks: "lxd.yaml"

  when:

    - 'type == "vm"'

    - "ansible_os_family =='Debian'"

    - "ansible_virtualization_type == 'kvm'"

  tags: "lxd"



# flush handler
@@ -151,7 +151,7 @@ 
# sysctl

- name: "sysctl - set sysctl"

  ansible.builtin.import_tasks: "sysctl.yaml"

  when: 'type == "vm" or type == "hw"'

  when: "ansible_virtualization_type == 'kvm'"

  tags: "sysctl"



# systemctl
@@ -161,8 +161,8 @@ 
  loop_control:

    loop_var: "__systemctl"

  when:

    - 'type == "vm"'

    - "ansible_os_family =='Debian'"

    - "ansible_virtualization_type == 'kvm'"

  tags: "systemctl"



# syslog