Skip to content

Commit 9f1a10d

Browse files
committed
decided to omit priority completly if not defined
removed duplicate of namespace declaration Added comments for better visibility
1 parent e86fa9c commit 9f1a10d

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

library/proxmox_storage.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,10 @@ def __init__(self, module):
247247
self.thinpool = module.params['thinpool']
248248
self.sparse = module.params['sparse']
249249
self.is_mountpoint = module.params['is_mountpoint']
250+
251+
# namespace for pbs
250252
self.namespace = module.params['namespace']
253+
# new params for cifs
251254
self.domain = module.params['domain']
252255
self.subdir = module.params['subdir']
253256
self.share = module.params['share']
@@ -342,20 +345,19 @@ def prepare_storage_args(self):
342345
args['sparse'] = 1 if self.sparse else 0
343346
if self.is_mountpoint is not None:
344347
args['is_mountpoint'] = 1 if self.is_mountpoint else 0
345-
if self.namespace is not None:
346-
args['namespace'] = self.namespace
348+
347349
# CIFS
348350
if self.subdir is not None:
349351
args['subdir'] = self.subdir
350352
if self.domain is not None:
351353
args['domain'] = self.domain
354+
if self.share is not None:
355+
args['share'] = self.share
352356
# end cifs
353357
if self.maxfiles is not None and 'backup' not in self.content:
354358
self.module.fail_json(msg="maxfiles is not allowed when there is no 'backup' in content")
355359
if self.krbd is not None and self.type != 'rbd':
356360
self.module.fail_json(msg="krbd is only allowed with 'rbd' storage type")
357-
if self.share is not None:
358-
args['share'] = self.share
359361

360362
return args
361363

tasks/pve_add_node.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
- name: Add node to Proxmox cluster
1818
ansible.builtin.command: >-
1919
pvecm add {{ hostvars[_init_node].pve_cluster_addr0 }} -use_ssh
20-
-link0 {{ pve_cluster_addr0 }},priority={% if pve_cluster_addr0_priority is defined %},priority={{ pve_cluster_addr0_priority }}{% endif %}
20+
-link0 {{ pve_cluster_addr0 }}{% if pve_cluster_addr0_priority is defined %},priority={{ pve_cluster_addr0_priority }}{% endif %}
2121
{% if pve_cluster_addr1 is defined %}
22-
-link1 {{ pve_cluster_addr1 }},priority={% if pve_cluster_addr1_priority is defined %},priority={{ pve_cluster_addr1_priority }}{% endif %}
22+
-link1 {{ pve_cluster_addr1 }}{% if pve_cluster_addr1_priority is defined %},priority={{ pve_cluster_addr1_priority }}{% endif %}
2323
{% endif %}
2424
# Ensure that nodes join one-by-one because cluster joins create a lock
2525
throttle: 1

tasks/pve_cluster_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
- name: Initialize a Proxmox cluster
5050
ansible.builtin.command: >-
5151
pvecm create {{ pve_cluster_clustername }}
52-
-link0 {{ pve_cluster_addr0 }},priority={{ pve_cluster_addr0_priority | default(0)}}
52+
-link0 {{ pve_cluster_addr0 }}{% if pve_cluster_addr0_priority is defined %},priority={{ pve_cluster_addr0_priority }}{% endif %}
5353
{% if pve_cluster_addr1 is defined %}
54-
-link1 {{ pve_cluster_addr1 }},priority={{ pve_cluster_addr1_priority | default(1)}}
54+
-link1 {{ pve_cluster_addr1 }}{% if pve_cluster_addr1_priority is defined %},priority={{ pve_cluster_addr1_priority }}{% endif %}
5555
{% endif %}
5656
args:
5757
creates: "{{ pve_cluster_conf }}"

0 commit comments

Comments
 (0)