recommended changes added

see PR#251

Author: edv-pi

README.md

@@ -422,6 +422,7 @@ pve_users: [] # List of user definitions to manage in PVE. See section on User M
 pve_storages: [] # List of storages to manage in PVE. See section on Storage Management.
 pve_datacenter_cfg: {} # Dictionary to configure the PVE datacenter.cfg config file.
 pve_domains_cfg: [] # List of realms to use as authentication sources in the PVE domains.cfg config file.
+pve_no_log: false # Set this to true in production to disable logging for strorage add to avoid having credentials leaked in log.
 ```
 
 To enable clustering with this role, configure the following variables appropriately:

defaults/main.yml

@@ -57,4 +57,4 @@ pve_storages: []
 pve_ssh_port: 22
 pve_manage_ssh: true
 pve_hooks: {}
-no_logging: false
+pve_no_logging: false

library/proxmox_storage.py

@@ -194,11 +194,11 @@
     pool: rpool/data
     sparse: true
 - name: CIFS-Share
-  proxmox_Storage:
+  proxmox_storage:
     name: cifs1
     server: cifs-host.domain.tld
     type: cifs
-    content: ["snippets", "vztmpl", "iso" ]
+    content: [ "snippets", "vztmpl", "iso" ]
     share: sharename
     subdir: /subdir
     username: user
@@ -251,6 +251,7 @@ def __init__(self, module):
         self.domain = module.params['domain']
         self.subdir = module.params['subdir']
         self.share = module.params['share']
+
         # Validate the parameters given to us
         fingerprint_re = re.compile('^([A-Fa-f0-9]{2}:){31}[A-Fa-f0-9]{2}$')
         if self.fingerprint is not None and not fingerprint_re.match(self.fingerprint):
@@ -355,6 +356,7 @@ def prepare_storage_args(self):
             self.module.fail_json(msg="krbd is only allowed with 'rbd' storage type")
         if self.share is not None:
             args['share'] = self.share
+
         return args
 
     def create_storage(self):
@@ -426,7 +428,7 @@ def main():
         nodes=dict(type='list', required=False, default=None),
         type=dict(default=None, type='str', required=True,
                   choices=["dir", "nfs", "rbd", "lvm", "lvmthin", "cephfs",
-                           "zfspool", "btrfs", "pbs","cifs"]),
+                           "zfspool", "btrfs", "pbs", "cifs"]),
         # Remaining PVE API arguments (depending on type) past this point
         datastore=dict(default=None, type='str', required=False),
         encryption_key=dict(default=None, type='str', required=False),
@@ -450,7 +452,6 @@ def main():
         subdir=dict(default=None, type='str', required=False),
         domain=dict(default=None, type='str', required=False),
         share=dict(default=None, type='str', required=False),
-
     )
 
     module = AnsibleModule(

tasks/main.yml

@@ -337,8 +337,7 @@
     domain: "{{ item.domain | default(omit) }}"
     subdir: "{{ item.subdir | default(omit) }}"
     share: "{{ item.share | default(omit) }}"
-# Set logging to true in production in ypur groupvars  
-  no_log: "{{ no_logging | default(false) }}"
+  no_log: "{{ pve_no_logging }}"
   with_items: "{{ pve_storages }}"
   when: "not pve_cluster_enabled | bool or (pve_cluster_enabled | bool and inventory_hostname == _init_node)"
   tags: storage

tasks/pve_add_node.yml

@@ -17,9 +17,9 @@
 - name: Add node to Proxmox cluster
   ansible.builtin.command: >-
     pvecm add {{ hostvars[_init_node].pve_cluster_addr0 }} -use_ssh
-    -link0 {{ pve_cluster_addr0 }},priority={{ pve_cluster_prio0 | default(omit)}}
+    -link0 {{ pve_cluster_addr0 }},priority={% if pve_cluster_addr0_priority is defined %},priority={{ pve_cluster_addr0_priority }}{% endif %}
     {% if pve_cluster_addr1 is defined %}
-    -link1 {{ pve_cluster_addr1 }},priority={{ pve_cluster_prio1 | default(omit)}}
+    -link1 {{ pve_cluster_addr1 }},priority={% if pve_cluster_addr1_priority is defined %},priority={{ pve_cluster_addr1_priority }}{% endif %}
     {% endif %}
   # Ensure that nodes join one-by-one because cluster joins create a lock
   throttle: 1

tasks/pve_cluster_config.yml

@@ -49,9 +49,9 @@
 - name: Initialize a Proxmox cluster
   ansible.builtin.command: >-
     pvecm create {{ pve_cluster_clustername }}
-    -link0 {{ pve_cluster_addr0 }},priority={{ pve_cluster_prio0 | default(omit)}}
+    -link0 {{ pve_cluster_addr0 }},priority={{ pve_cluster_addr0_priority | default(0)}}
     {% if pve_cluster_addr1 is defined %}
-    -link1 {{ pve_cluster_addr1 }},priority={{ pve_cluster_prio1 | default(omit)}}
+    -link1 {{ pve_cluster_addr1 }},priority={{ pve_cluster_addr1_priority | default(1)}}
     {% endif %}
   args:
     creates: "{{ pve_cluster_conf }}"