Merge branch 'master' into k3s-1-26

This commit is contained in:
Techno Tim
2023-04-16 16:49:42 -05:00
committed by GitHub
4 changed files with 8 additions and 7 deletions

View File

@@ -0,0 +1,2 @@
---
ansible_user: '{{ proxmox_lxc_ssh_user }}'

View File

@@ -6,12 +6,12 @@
# #
ansible-compat==3.0.1 ansible-compat==3.0.1
# via molecule # via molecule
ansible-core==2.14.3 ansible-core==2.14.4
# via # via
# -r requirements.in # -r requirements.in
# ansible-compat # ansible-compat
# ansible-lint # ansible-lint
ansible-lint==6.14.2 ansible-lint==6.14.6
# via -r requirements.in # via -r requirements.in
arrow==1.2.3 arrow==1.2.3
# via jinja2-time # via jinja2-time
@@ -202,7 +202,7 @@ wcmatch==8.4.1
# via ansible-lint # via ansible-lint
websocket-client==1.4.2 websocket-client==1.4.2
# via kubernetes # via kubernetes
yamllint==1.29.0 yamllint==1.30.0
# via # via
# -r requirements.in # -r requirements.in
# ansible-lint # ansible-lint

View File

@@ -67,18 +67,18 @@
content: "{{ lookup('template', 'templates/rc.local.j2') }}" content: "{{ lookup('template', 'templates/rc.local.j2') }}"
create: false create: false
state: absent state: absent
when: proxmox_lxc_configure and rclocal.stat.exists when: proxmox_lxc_configure and rcfile.stat.exists
- name: Check rc.local for cleanup - name: Check rc.local for cleanup
become: true become: true
slurp: slurp:
src: /etc/rc.local src: /etc/rc.local
register: rcslurp 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 - name: Cleanup rc.local if we only have a Shebang line
become: true become: true
file: file:
path: /etc/rc.local path: /etc/rc.local
state: absent 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

View File

@@ -3,7 +3,6 @@
- hosts: proxmox - hosts: proxmox
gather_facts: true gather_facts: true
become: yes become: yes
remote_user: "{{ proxmox_lxc_ssh_user }}"
roles: roles:
- role: proxmox_lxc - role: proxmox_lxc
when: proxmox_lxc_configure when: proxmox_lxc_configure