Merge branch '16-ansible-update-fixes' into 'development'

fix: "migrate role for Ansible Upgrade 2.14.5->2.16.1"

Closes #16 and execution_environment#21

See merge request nofusscomputing/projects/ansible/kubernetes!15
This commit is contained in:
2023-12-08 12:22:25 +00:00
2 changed files with 9 additions and 14 deletions

View File

@ -29,7 +29,7 @@
state: restarted state: restarted
listen: kubernetes_restart listen: kubernetes_restart
when: |- when: |-
{%- if not (
nfc_kubernetes_no_restart nfc_kubernetes_no_restart
or or
( (
@ -49,8 +49,5 @@
and and
nfc_kubernetes_no_restart_slave nfc_kubernetes_no_restart_slave
) )
-%} )
false
{%- else -%}
true
{%- endif %}

View File

@ -12,7 +12,7 @@
- name: Remove swapfile from /etc/fstab - name: Remove swapfile from /etc/fstab
mount: ansible.posix.mount:
name: "{{ item }}" name: "{{ item }}"
fstype: swap fstype: swap
state: absent state: absent
@ -26,16 +26,16 @@
- name: Disable swap - name: Disable swap
command: swapoff -a ansible.builtin.command:
cmd: swapoff -a
changed_when: false changed_when: false
when: when:
#- ansible_swaptotal_mb > 0
- ansible_os_family == 'Debian' - ansible_os_family == 'Debian'
tags: tags:
- install - install
- name: Check an armbian os system - name: Check an armbian os system
stat: ansible.builtin.stat:
path: /etc/default/armbian-zram-config path: /etc/default/armbian-zram-config
register: armbian_stat_result register: armbian_stat_result
@ -48,8 +48,6 @@
args: args:
executable: bash executable: bash
changed_when: false changed_when: false
# failed_when: false
#notify: RebootHost # doesnt need to reboot as swapoff -a covers the deployment
when: armbian_stat_result.stat.exists when: armbian_stat_result.stat.exists