Update to 2024-08-20 10:00

roles/pve/defaults/main.yml

@@ -1,10 +1,5 @@
 ---
 
-pve_dump_storage: local
-
-pve_mod_to_load:
-  - nf_conntrack_proto_gre
-
 pve_ksm: True
 pve_ksm_sleep_msec: 5
 pve_ksm_thres_coef: 35

roles/pve/tasks/facts.yml

@@ -1,8 +0,0 @@
----
-
-# The module is unavailable in PVE >= 6
-# as it's built in the kernel
-- name: Do not load nf_conntrack_proto_gre for PVE6
-  set_fact: pve_mod_to_load={{ pve_mod_to_load | difference(['nf_conntrack_proto_gre']) }}
-  when: ansible_distribution_major_version | int >= 10
-  tags: pve

roles/pve/tasks/main.yml

@@ -1,22 +1,13 @@
 ---
 
-- include_tasks: facts.yml
-  tags: always
-
 - name: Install tools
   apt:
     name:
-      - pigz
       - ksm-control-daemon
-      - openvswitch-switch
       - ethtool
       - patch
   tags: pve
 
-- name: Deploy vzdump config
-  template: src=vzdump.conf.j2 dest=/etc/vzdump.conf
-  tags: pve
-
 - name: Deploy ksm configuration
   template: src=ksmtuned.conf.j2 dest=/etc/ksmtuned.conf
   notify: restart ksmtuned
@@ -26,70 +17,6 @@
   service: name=ksmtuned state={{ pve_ksm | ternary('started','stopped') }} enabled={{ pve_ksm | ternary(True,False) }}
   tags: pve
 
-- name: Configure modules to load
-  copy: content={{ pve_mod_to_load | join("\n") }} dest=/etc/modules-load.d/firewall.conf
-  register: pve_modules
-  tags: pve
-
-- name: Load modules
-  service: name=systemd-modules-load state=restarted
-  when: pve_modules.changed
-  tags: pve
-
-- name: Check proxmox cluster status
-  command: pvesh get /cluster/status --output-format=json
-  register: pve_cluster_status_1
-  ignore_errors: True
-  changed_when: False
-  tags: pve
-
-- name: Parse proxmox cluster status
-  set_fact: pve_cluster={{ pve_cluster_status_1.stdout | from_json }}
-  when: pve_cluster_status_1.rc == 0
-  tags: pve
-
-- name: Check proxmox cluster status (old pvesh)
-  command: pvesh get /cluster/status
-  when: pve_cluster_status_1.rc != 0
-  register: pve_cluster_status_2
-  changed_when: False
-  tags: pve
-
-- name: Parse proxmox cluster status (old pvesh)
-  set_fact: pve_cluster={{ pve_cluster_status_2.stdout | from_json }}
-  when: pve_cluster_status_1.rc != 0
-  tags: pve
-
-- name: Deploy the unlock_dev script
-  copy: src=unlock_dev dest=/usr/local/bin/unlock_dev mode=755
-  tags: pve
-
-- name: Check if the old hookd daemon is installed
-  stat: path=/usr/local/bin/pve-hookd
-  register: pve_old_hookd
-  tags: pve
-
-- name: Stop the old hookd daemon
-  service: name=pve-hookd state=stopped
-  when: pve_old_hookd.stat.exists
-  tags: pve
-
-- name: Remove the old hook daemon
-  file: path={{ item }} state=absent
-  loop:
-    - /usr/local/bin/pve-hookd
-    - /etc/hooks
-    - /etc/systemd/system/pve-hookd.service
-    - /etc/tmpfiles.d/pve-container-hooks.conf
-    - /etc/systemd/system/pve-container@.service.d/pve-container-hooks.conf
-    - /var/run/lxc/active
-  tags: pve
-
-- name: Reload systemd
-  command: systemctl daemon-reload
-  when: pve_old_hookd.stat.exists
-  tags: pve
-
 - include_tasks: pve_online.yml
   when: pve_online == True
   tags: always
@@ -113,26 +40,6 @@
   notify: restart pveproxy
   tags: pve
 
-- name: Rise limits for containers
-  pam_limits:
-    domain: '*'
-    limit_type: "{{ item.type }}"
-    limit_item: nofile
-    value: "{{ item.value }}"
-  loop:
-    - type: soft
-      value: 65000
-    - type: hard
-      value: 65535
-  tags: pve
-
-- name: Rise inotify instances
-  sysctl:
-    name: fs.inotify.max_user_instances
-    value: 1024
-    sysctl_file: /etc/sysctl.d/ansible.conf
-  tags: pve
-
 - name: Ensure dehydrated hook dir exists
   file: path=/etc/dehydrated/hooks_deploy_cert.d/ state=directory
   tags: pve,ssl
@@ -141,26 +48,6 @@
   template: src=dehydrated_hook.sh.j2 dest=/etc/dehydrated/hooks_deploy_cert.d/20pve.sh mode=755
   tags: pve,ssl
 
-# See https://bugzilla.proxmox.com/show_bug.cgi?id=2326 why
-- name: Create corosync override directory
-  file: path=/etc/systemd/system/corosync.service.d/ state=directory
-  tags: pve
-
-- name: Setup corosync to be restarted in case of failure
-  copy:
-    content: |
-      [Service]
-      Restart=on-failure
-      RestartSec=1
-    dest: /etc/systemd/system/corosync.service.d/ansible.conf
-  register: pve_corosync_unit
-  tags: pve
-
-- name: Reload systemd
-  systemd: daemon_reload=True
-  when: pve_corosync_unit.changed
-  tags: pve
-
 - include_tasks: zabbix.yml
   tags: always
 

roles/pve/tasks/zabbix.yml

@@ -12,5 +12,5 @@
     user: root
     job: "/var/lib/zabbix/bin/util_populate_pve_cache"
     minute: "*/5"
-    state: "{{ (pve_zabbix_cache and pve_zabbix_scripts.stat.exists) | ternary('present','absent') }}"
+    state: "{{ (pve_zabbix_cache and pve_zabbix_scripts.stat.exists and pve_zabbix_cache) | ternary('present','absent') }}"
   tags: pve,zabbix