Deprecate old cluster role variables completely, include IPv6 in default

Author: lae

README.md

@@ -426,7 +426,7 @@ PVE version. They should be IPv4 or IPv6 addresses. For more information, refer
 to the [Cluster Manager][pvecm-network] chapter in the PVE Documentation.
 
 ```
-# pve_cluster_addr0: "{{ ansible_default_ipv4.address }}"
+# pve_cluster_addr0: "{{ defaults to the default interface ipv4 or ipv6 if detected }}"
 # pve_cluster_addr1: "another interface's IP address or hostname"
 ```
 

defaults/main.yml

@@ -33,7 +33,7 @@ pve_ceph_crush_rules: []
 pve_cluster_enabled: no
 pve_cluster_clustername: "{{ pve_group }}"
 pve_manage_hosts_enabled: yes
-# pve_cluster_addr0: "{{ ansible_default_ipv4.address }}"
+pve_cluster_addr0: "{{ ansible_default_ipv4.address if ansible_default_ipv4.address is defined else ansible_default_ipv6.address if ansible_default_ipv6.address is defined }}"
 # pve_cluster_addr1: "{{ ansible_eth1.ipv4.address }}
 pve_datacenter_cfg: {}
 pve_cluster_ha_groups: []

tasks/load_variables.yml

@@ -2,29 +2,6 @@
 - name: Gather distribution specific variables
   include_vars: "debian-{{ ansible_distribution_release }}.yml"
 
-- block:
-  # Per Proxmox documentation, bindnet_addr is expected to be an IP address and
-  # ring_addr can be either hostname or IP, but this role has always used an IP
-  # address. Thus, we're deprecating them. See below references.
-  # https://pve.proxmox.com/wiki/Separate_Cluster_Network#Setup_at_Cluster_Creation
-  # https://git.proxmox.com/?p=pve-cluster.git;a=blob;f=data/PVE/Corosync.pm;h=8b5c91e0da084da4e9ba7423176872a0c16ef5af;hb=refs/heads/stable-5#l209
-    - name: LEGACY - Define pve_cluster_addr0 from link0_addr
-      set_fact:
-        pve_cluster_addr0: "{{ pve_cluster_link0_addr }}"
-      when: "pve_cluster_link0_addr is defined and ansible_distribution_release == 'buster'"
-  when: "pve_cluster_addr0 is not defined"
-
-- block:
-    - name: LEGACY - Define pve_cluster_addr1 from link1_addr
-      set_fact:
-        pve_cluster_addr1: "{{ pve_cluster_link1_addr }}"
-      when: "pve_cluster_link1_addr is defined and ansible_distribution_release == 'buster'"
-  when: "pve_cluster_addr1 is not defined"
-
-- name: Define pve_cluster_addr0 if not provided
-  set_fact:
-    pve_cluster_addr0: "{{ pve_cluster_addr0 | default(_pve_cluster_addr0) }}"
-
 - name: Calculate list of SSH addresses
   set_fact:
     pve_cluster_ssh_addrs: >-

vars/main.yml

@@ -2,6 +2,3 @@
 # vars file for ansible-role-proxmox
 pve_base_dir: "/etc/pve"
 pve_cluster_conf: "{{ pve_base_dir }}/corosync.conf"
-
-# defaults that need to be host facts
-_pve_cluster_addr0: "{{ ansible_default_ipv4.address }}"