diff --git a/inventory/sample/group_vars/proxmox.yml b/inventory/sample/group_vars/proxmox.yml new file mode 100644 index 00000000..ea1759b2 --- /dev/null +++ b/inventory/sample/group_vars/proxmox.yml @@ -0,0 +1,2 @@ +--- +ansible_user: '{{ proxmox_lxc_ssh_user }}' diff --git a/requirements.txt b/requirements.txt index 1027404d..b0b93d62 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,12 +6,12 @@ # ansible-compat==3.0.1 # via molecule -ansible-core==2.14.3 +ansible-core==2.14.4 # via # -r requirements.in # ansible-compat # ansible-lint -ansible-lint==6.14.2 +ansible-lint==6.14.6 # via -r requirements.in arrow==1.2.3 # via jinja2-time @@ -202,7 +202,7 @@ wcmatch==8.4.1 # via ansible-lint websocket-client==1.4.2 # via kubernetes -yamllint==1.29.0 +yamllint==1.30.0 # via # -r requirements.in # ansible-lint diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index b9cdd6ed..cd3bf720 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -67,18 +67,18 @@ content: "{{ lookup('template', 'templates/rc.local.j2') }}" create: false state: absent - when: proxmox_lxc_configure and rclocal.stat.exists + when: proxmox_lxc_configure and rcfile.stat.exists - name: Check rc.local for cleanup become: true slurp: src: /etc/rc.local register: rcslurp - when: proxmox_lxc_configure and rclocal.stat.exists + when: proxmox_lxc_configure and rcfile.stat.exists - name: Cleanup rc.local if we only have a Shebang line become: true file: path: /etc/rc.local state: absent - when: proxmox_lxc_configure and rclocal.stat.exists and ((rcslurp.content | b64decode).splitlines() | length) <= 1 + when: proxmox_lxc_configure and rcfile.stat.exists and ((rcslurp.content | b64decode).splitlines() | length) <= 1 diff --git a/site.yml b/site.yml index d8e4325f..5104cce2 100644 --- a/site.yml +++ b/site.yml @@ -3,7 +3,6 @@ - hosts: proxmox gather_facts: true become: yes - remote_user: "{{ proxmox_lxc_ssh_user }}" roles: - role: proxmox_lxc when: proxmox_lxc_configure