Update to 2022-03-07 16:00

roles/pve/defaults/main.yml

@@ -23,8 +23,6 @@ pve_wan_bridge: vmbr1
 # This is not needed if the wan bridge has the same MAC addr on every node
 pve_migrate_flush_arp: True
 
-pve_ovh: False
-
 pve_cluster_vhosts: []
 # pve_cluster_vhosts:
 #   - pve.example.net

roles/pve/tasks/facts.yml

@@ -1,6 +1,7 @@
 ---
 
-  # The module is unavailable
+# 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

roles/pve/tasks/main.yml

@@ -1,6 +1,7 @@
 ---
 
-- include: facts.yml
+- include_tasks: facts.yml
+  tags: always
 
 - name: Install tools
   apt:
@@ -10,76 +11,94 @@
       - 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
+  tags: pve
 
 - name: Handle ksm services
   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: Enable ocfs2 support
   set_fact: pve_ocfs2=True
   when: fstab | default([]) | selectattr('fstype','equalto','ocfs2') | list | length > 0
+  tags: pve
 
 - name: Install ocfs2 support
   apt: name=ocfs2-tools state=present
   when: pve_ocfs2 == True
+  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 ocfs2 config
   template: src=ocfs2.conf.j2 dest=/etc/ocfs2/cluster.conf
   when: pve_ocfs2 == True
   notify: restart o2cb
+  tags: pve
 
 - name: Deploy o2cb conf
   template: src=o2cb.j2 dest=/etc/default/o2cb
   when: pve_ocfs2 == True
+  tags: pve
 
 - name: Handle o2cb service
   service: name=o2cb state=started enabled=True
   when: pve_ocfs2 == True
+  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
@@ -90,32 +109,35 @@
     - /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
-
-- include_tasks: ovh.yml
-  when: pve_ovh == True
+  tags: always
 
 - name: Create backup dir
   file: path=/home/lbkp/pve state=directory
+  tags: pve
 
 - name: Install pre and post backup scripts
   copy: src={{ item.src }} dest=/etc/backup/{{ item.type }}.d/{{ item.src }} mode=755
-  with_items:
+  loop:
     - src: pve_dump
       type: pre
     - src: pve_rm_dump
       type: post
+  tags: pve
 
 - name: Remove registration nag
   patch: src=remove_nag.patch dest=/usr/share/perl5/PVE/API2/Subscription.pm
   ignore_errors: True # Don't fail on old PVE where the patch doesn't apply
   notify: restart pveproxy
+  tags: pve
 
 - name: Rise limits for containers
   pam_limits:
@@ -123,25 +145,29 @@
     limit_type: "{{ item.type }}"
     limit_item: nofile
     value: "{{ item.value }}"
-  with_items:
+  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
 
 - name: Deploy dehydrated hook
   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
+# 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
@@ -161,5 +187,8 @@
   when: pve_corosync_unit.changed
   tags: pve
 
-- include: zabbix.yml
-- include: filebeat.yml
+- include_tasks: zabbix.yml
+  tags: always
+
+- include_tasks: filebeat.yml
+  tags: always

roles/pve/tasks/ovh.yml

@@ -1,6 +0,0 @@
----
-
-- name: Add vrack routing table
-  copy:
-    content: "1 vrack"
-    dest: /etc/iproute2/rt_tables.d/ovh.conf

roles/pve/tasks/pve_online.yml

@@ -8,31 +8,40 @@
       - libarray-diff-perl
       - libdata-validate-ip-perl
       - liblogger-syslog-perl
+  tags: pve
 
 - name: Deploy Online.net integration script
   copy: src=pve-online dest=/usr/local/bin/pve-online mode=755
+  tags: pve
 
 - name: Deploy Online.net integration conf
   template: src=pve-online.conf.j2 dest=/etc/pve-online.conf mode=600
+  tags: pve
 
 - name: Create hook directory on local storage
   file: path=/var/lib/vz/snippets state=directory
+  tags: pve
 
 - name: Deploy Online hook
   copy: src=online_hook.pl dest=/var/lib/vz/snippets/online_hook.pl mode=755
+  tags: pve
 
 - name: Ensure /etc/systemd/system/ exists
   file: path=/etc/systemd/system/ state=directory
+  tags: pve
 
 - name: Disable pve-online-gre service
   service: name=pve-online-gre state=stopped enabled=False
   failed_when: False
+  tags: pve
 
 - name: Remove pve-online-gre service unit
   file: path=/etc/systemd/system/pve-online-gre.service state=absent
   register: pve_gre_unit
+  tags: pve
 
 - name: Reload systemd
   systemd: daemon_reload=True
   when: pve_gre_unit.changed
+  tags: pve