Fix errors caused during refactoring / moving files around (path, varnames, escaping)

Author: andreashaerter

roles/pve/meta/argument_specs.yml

@@ -1498,7 +1498,7 @@ argument_specs:
                   encryption: "aes-256-gcm"
                   keyformat: "passphrase"
                   keylocation: "prompt"
-                  passphrase: "{{ vault_zfs_passphrase }}"
+                  passphrase: "\{\{ vault_passphrase \}\}"
 
             # NFS backup storage
             - name: "nfs-backup"
@@ -1731,7 +1731,7 @@ argument_specs:
                     encryption: "aes-256-gcm"
                     keyformat: "passphrase"
                     keylocation: "prompt"
-                    passphrase: "{{ vault_passphrase }}"
+                    passphrase: "\{\{ vault_passphrase \}\}"
                     passphrase_old:
                       - "12345aaaaarrrrRR"
                       - "456789bbbbbbbTTT"

roles/pve/tasks/init.yml

@@ -7,22 +7,22 @@
     gather_subset:
       - "distribution"
   when:
-    - not ansible_facts.keys() | list | intersect(__run_proxmox_used_facts) == __run_proxmox_used_facts
+    - not ansible_facts.keys() | list | intersect(__pve_proxmox_used_facts) == __pve_proxmox_used_facts
 
 
 - name: "Init | Include role meta data"
   ansible.builtin.include_vars:
     file: "../meta/main.yml"
-    name: "__run_proxmox_meta"
+    name: "__pve_proxmox_meta"
 
 
 - name: "Init | Check Ansible version requirement and fail if unmet"
   ansible.builtin.fail:
     msg: >
-      This role requires Ansible {{ __run_proxmox_meta['galaxy_info']['min_ansible_version'] }}
+      This role requires Ansible {{ __pve_proxmox_meta['galaxy_info']['min_ansible_version'] }}
       or higher. You are currently running Ansible {{ ansible_version['full'] }} .
   when:
-    - ansible_version['full'] is version_compare(__run_proxmox_meta['galaxy_info']['min_ansible_version'], "<")
+    - ansible_version['full'] is version_compare(__pve_proxmox_meta['galaxy_info']['min_ansible_version'], "<")
 
 
 - name: "Init | Notify when platform support check is not possible"
@@ -36,18 +36,18 @@
       ansible_facts['distribution'] is not defined or
       ansible_facts['distribution_version'] is not defined or
       ansible_facts['distribution_major_version'] is not defined or
-      (__run_proxmox_supported_platforms | length) < 1
+      (__pve_proxmox_supported_platforms | length) < 1
 
 
 - name: "Init | Warn when platform is unsupported"
   ansible.builtin.fail:
     msg: >
       Neither {{ ansible_facts['distribution'] }} (distribution) nor {{ ansible_facts['os_family'] }} (os_family)
       with versions '{{ ansible_facts['distribution_major_version'] }}', '{{ ansible_facts['distribution_version'] }}',
-      or 'all' is in the list of supported platforms from vars/main.yml: {{ __run_proxmox_supported_platforms }}
+      or 'all' is in the list of supported platforms from vars/main.yml: {{ __pve_proxmox_supported_platforms }}
   when:
-    - (__run_proxmox_supported_platforms | length) > 0
-    - (__run_proxmox_supported_platforms
+    - (__pve_proxmox_supported_platforms | length) > 0
+    - (__pve_proxmox_supported_platforms
        | selectattr('name', 'match', '^(' ~ ansible_facts['distribution'] ~ '|' ~ ansible_facts['os_family'] ~ ')$', ignorecase=true)
        | map(attribute='versions') | flatten
        | select('match', '^(' ~ ansible_facts['distribution_major_version'] ~ '|' ~ ansible_facts['distribution_version'] ~ '|all)$', ignorecase=true)
@@ -57,7 +57,7 @@
 
 - name: "Init | Set platform-specific filename list (most to least specific; raw with possible duplicates)"
   ansible.builtin.set_fact:
-    __run_proxmox_platform_filenames_raw:
+    __pve_proxmox_platform_filenames_raw:
       - "{{ ansible_facts['distribution'].replace(' ', '_') | lower }}_{{ ansible_facts['distribution_version'].replace(' ', '_') | lower }}.yml"
       - "{{ ansible_facts['distribution'].replace(' ', '_') | lower }}_{{ ansible_facts['distribution_major_version'].replace(' ', '_') | lower }}.yml"
       - "{{ ansible_facts['distribution'].replace(' ', '_') | lower }}.yml"
@@ -66,22 +66,22 @@
 
 - name: "Init | Set unique platform-specific filename list (most to least specific)"
   ansible.builtin.set_fact:
-    __run_proxmox_platform_filenames_most_specific_first: "{{ (__run_proxmox_platform_filenames_raw | ansible.builtin.unique | default([])) }}"
+    __pve_proxmox_platform_filenames_most_specific_first: "{{ (__pve_proxmox_platform_filenames_raw | ansible.builtin.unique | default([])) }}"
 
 
 - name: "Init | Set unique platform-specific filename list (least to most specific)"
   ansible.builtin.set_fact:
-    __run_proxmox_platform_filenames_most_specific_last: "{{ __run_proxmox_platform_filenames_most_specific_first | reverse }}"
+    __pve_proxmox_platform_filenames_most_specific_last: "{{ __pve_proxmox_platform_filenames_most_specific_first | reverse }}"
 
 
 - name: "Init | Include platform-specific variables (if any), overwrite values with more specific ones"
   ansible.builtin.include_vars:
-    file: "{{ __run_proxmox_vars_file }}"
+    file: "{{ __pve_proxmox_vars_file }}"
   vars:
-    __run_proxmox_vars_file: "{{ role_path }}/vars/{{ item }}"
+    __pve_proxmox_vars_file: "{{ role_path }}/vars/{{ item }}"
   when:
-    - __run_proxmox_vars_file is file
-  loop: "{{ __run_proxmox_platform_filenames_most_specific_last }}"
+    - __pve_proxmox_vars_file is file
+  loop: "{{ __pve_proxmox_platform_filenames_most_specific_last }}"
 
 
 - name: "Init | Create temporary directory for file backups (disaster safeguard)"

roles/pve/templates/_render_cfg_value.j2

@@ -1,6 +1,6 @@
 {#-
   Render helper: dict -> "k=v,k2=v2", only-mapping value as-is
-  Import once from other templates files: {% from 'pve/_render_cfg_value.j2' import render_cfg_value %}
+  Import once from other templates files: {% from '_render_cfg_value.j2' import render_cfg_value %}
 -#}
 {%- macro render_cfg_value(value) -%}
 {%-   if value is mapping -%}

roles/pve/templates/datacenter.cfg.j2

@@ -4,7 +4,7 @@
 
 {# Normalize and/or validate input #}
 {%- set pve_datacentercfg = tpl_pve_datacentercfg | default({}, true) -%}
-{%- from 'pve/_render_cfg_value.j2' import render_cfg_value -%}
+{%- from '_render_cfg_value.j2' import render_cfg_value -%}
 
 {% if pve_datacentercfg | length > 0 %}
 {%   for item in pve_datacentercfg | dict2items | sort(attribute='key') %}

roles/pve/templates/firewall/_aliases_block.j2

@@ -1,6 +1,6 @@
 {#-
   Template to generate a Proxmox VE firewall [ALIASES] block. To be called
-  from other templates files: {% include 'pve/firewall/_aliases_block.j2' %}
+  from other templates files: {% include 'firewall/_aliases_block.j2' %}
 
   Expects an 'fw_aliases' variable.
 -#}

roles/pve/templates/firewall/_groups_block.j2

@@ -1,6 +1,6 @@
 {#-
   Template to generate Proxmox VE firewall [group ...] blocks. To be called
-  from other templates files: {% include 'pve/firewall/_groups_block.j2' %}
+  from other templates files: {% include 'firewall/_groups_block.j2' %}
 
   Expects an 'fw_securitygroups' variable.
 -#}
@@ -25,7 +25,7 @@
 [group {{ group['name'] }}]{% if group['comment'] is defined %} # {{ group['comment'] }}{% endif %}
 
 {%     for rule in group['rules'] %}
-{%       include 'pve/firewall/_rule_line.j2' %}
+{%       include 'firewall/_rule_line.j2' %}
 {%     endfor %}
 
 {%   endfor %}

roles/pve/templates/firewall/_ipsets_block.j2

@@ -1,6 +1,6 @@
 {#-
   Template to generate Proxmox VE firewall [IPSET ...] blocks. To be called
-  from other templates files: {% include 'pve/firewall/_ipsets_block.j2' %}
+  from other templates files: {% include 'firewall/_ipsets_block.j2' %}
 
   Expects an 'fw_ipsets' variable.
 -#}

roles/pve/templates/firewall/_options_block.j2

@@ -1,10 +1,10 @@
 {#-
   Template to generate a Proxmox VE firewall [OPTIONS] block. To be called
-  from other templates files: {% include 'pve/firewall/_options_block.j2' %}
+  from other templates files: {% include 'firewall/_options_block.j2' %}
 
   Expects an 'fw_options' variable.
 -#}
-{%- from 'pve/_render_cfg_value.j2' import render_cfg_value -%}
+{%- from '_render_cfg_value.j2' import render_cfg_value -%}
 {% if fw_options is defined and fw_options | length > 0 %}
 [OPTIONS]
 {%   for key, value in fw_options.items() %}

roles/pve/templates/firewall/_rule_line.j2

@@ -1,6 +1,6 @@
 {#-
   Template to generate a Proxmox VE firewall rule line. To be called
-  from other templates files: {% include 'pve/firewall/_rule_line.j2' %}
+  from other templates files: {% include 'firewall/_rule_line.j2' %}
 
   Expects a 'rule' variable:
 

roles/pve/templates/firewall/_rules_block.j2

@@ -1,13 +1,13 @@
 {#-
   Template to generate a Proxmox VE firewall [RULES] block. To be called
-  from other templates files: {% include 'pve/firewall/_rules_block.j2' %}
+  from other templates files: {% include 'firewall/_rules_block.j2' %}
 
   Expects an 'fw_rules' variable.
 -#}
 {% if fw_rules is defined and fw_rules | length > 0 %}
 [RULES]
 {%   for rule in fw_rules %}
-{%     include 'pve/firewall/_rule_line.j2' %}
+{%     include 'firewall/_rule_line.j2' %}
 {%   endfor %}
 {% else %}
 # No [RULES] defined