Merge pull request #42 from fnord123/master

Fix Raspbian role to run correctly on Python 3.x (e.g. Ubuntu 20.04) Ansible host
This commit is contained in:
Julien DOCHE
2020-07-24 11:27:58 +02:00
committed by GitHub

View File

@@ -5,7 +5,7 @@
( ansible_facts.architecture is search("arm") and ( ansible_facts.architecture is search("arm") and
ansible_facts.lsb.description is match("[Rr]aspbian.*[Bb]uster") ) or ansible_facts.lsb.description is match("[Rr]aspbian.*[Bb]uster") ) or
( ansible_facts.architecture is search("aarch64") and ( ansible_facts.architecture is search("aarch64") and
ansible_facts.lsb.description is match("Debian.*buster") ) %}true{% else %}false{% endif %}' ansible_facts.lsb.description is match("Debian.*buster") ) %}True{% else %}False{% endif %}'
- name: Activating cgroup support - name: Activating cgroup support
lineinfile: lineinfile:
@@ -13,32 +13,27 @@
regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$' regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$'
line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory' line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
backrefs: true backrefs: true
when: when: raspbian
- raspbian is true
- name: Flush iptables before changing to iptables-legacy - name: Flush iptables before changing to iptables-legacy
iptables: iptables:
flush: true flush: true
when: when: raspbian
- raspbian is true
- name: Changing to iptables-legacy - name: Changing to iptables-legacy
alternatives: alternatives:
path: /usr/sbin/iptables-legacy path: /usr/sbin/iptables-legacy
name: iptables name: iptables
register: ip4_legacy register: ip4_legacy
when: when: raspbian
- raspbian is true
- name: Changing to ip6tables-legacy - name: Changing to ip6tables-legacy
alternatives: alternatives:
path: /usr/sbin/ip6tables-legacy path: /usr/sbin/ip6tables-legacy
name: ip6tables name: ip6tables
register: ip6_legacy register: ip6_legacy
when: when: raspbian
- raspbian is true
- name: Rebooting - name: Rebooting
reboot: reboot:
when: when: raspbian
- raspbian is true