Remove proxmox_lxc_netif variable

bellackn · Mar 7, 2021 · dc991e3 · dc991e3
1 parent 97fa5d8
commit dc991e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,8 @@ Container template to be used.
 
     proxmox_lxc_password: ""  # Minimum length is 5
 
-Initial root password for the container.
+Initial root password for the container. Either set it globally with this variable or set it for each container
+individually, like in the example playbook.
 
 ### Optional
 
@@ -82,7 +83,6 @@ nodes in your cluster.
     proxmox_lxc_memory: 512
     proxmox_lxc_mounts: {}
     proxmox_lxc_nameserver: ""
-    proxmox_lxc_netif: {}
     proxmox_lxc_onboot: no
     proxmox_lxc_pool: ""
     proxmox_lxc_pubkey: ""

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -14,7 +14,6 @@ proxmox_lxc_hookscript: ""
 proxmox_lxc_memory: 512
 proxmox_lxc_mounts: {}
 proxmox_lxc_nameserver: ""
-proxmox_lxc_netif: {}
 proxmox_lxc_node: "{{ proxmox_lxc_api_host }}"
 proxmox_lxc_onboot: no
 proxmox_lxc_password: ""  # Minimum length is 5

diff --git a/tasks/create_lxc.yml b/tasks/create_lxc.yml
@@ -2,7 +2,7 @@
 - name: "Extract specified IP address of LXC '{{ item.hostname }}"
   set_fact:
     _proxmox_lxc_ip_address: "{{ item.netif | regex_replace('^.*ip=(.*?)\/.*$', '\\1') | trim }}"
-  when: item.netif is defined or proxmox_lxc_netif | length > 0
+  when: item.netif is defined
 
 - name: "Create LXC '{{ item.hostname }}'"
   community.general.proxmox:
@@ -25,7 +25,7 @@
     onboot: "{{ item.onboot | default(proxmox_lxc_onboot) }}"
     ostemplate: "{{ item.ostemplate | default(proxmox_lxc_ostemplate) }}"
     password: "{{ item.password | default(proxmox_lxc_password) }}"
-    netif: "{{ item.netif | default(proxmox_lxc_netif) }}"
+    netif: "{{ item.netif | default(omit) }}"
     pool: "{{ item.pool | default(proxmox_lxc_pool | ternary(proxmox_lxc_pool, omit)) }}"
     proxmox_default_behavior: no_defaults
     pubkey: "{{ item.pubkey | default(proxmox_lxc_pubkey) }}"
@@ -65,7 +65,7 @@
   delegate_to: "{{ proxmox_lxc_node }}"
   when:
     - proxmox_lxc_created.changed
-    - item.netif is defined or proxmox_lxc_netif | length > 0
+    - item.netif is defined
 
 - name: "Wait until sshd of LXC '{{ item.hostname }}' is ready"  # noqa 503
   wait_for:
@@ -75,4 +75,4 @@
     timeout: "{{ proxmox_lxc_network_timeout }}"
   when:
     - proxmox_lxc_created.changed
-    - item.netif is defined or proxmox_lxc_netif | length > 0
+    - item.netif is defined