Update to 2020-07-17 17:00

master
Daniel Berteaud 4 years ago
parent 90c08f6330
commit c7cfdc5fb7
  1. 10
      roles/backup/tasks/main.yml
  2. 2
      roles/common/meta/main.yml
  3. 2
      roles/common/tasks/system.yml
  4. 1
      roles/network/tasks/main.yml

@ -81,4 +81,14 @@
when: lsi_controllers | default([]) | length > 0 when: lsi_controllers | default([]) | length > 0
tags: backup tags: backup
- name: Excludes for proxmox backup client
copy:
dest: /.pxarexclude
content: |
var/log/lastlog
when:
- ansible_virtualization_role == 'guest'
- ansible_virtualization_type == 'lxc' or ansible_virtualization_type == 'systemd-nspawn'
tags: backup
... ...

@ -15,7 +15,7 @@ dependencies:
- role: sssd_ad_auth - role: sssd_ad_auth
when: ad_auth | default(False) when: ad_auth | default(False)
- role: ntp_client - role: ntp_client
when: ansible_virtualization_role == 'host' or ansible_virtualization_type != 'lxc' when: ansible_virtualization_role == 'host' or (ansible_virtualization_type != 'lxc' and ansible_virtualization_type != 'systemd-nspawn')
- role: sudo - role: sudo
- role: ssh - role: ssh
- role: patrix - role: patrix

@ -48,7 +48,7 @@
value: "{{ system_swappiness }}" value: "{{ system_swappiness }}"
sysctl_file: /etc/sysctl.d/ansible.conf sysctl_file: /etc/sysctl.d/ansible.conf
state: present state: present
when: ansible_virtualization_role == 'host' or ansible_virtualization_type != 'lxc' when: ansible_virtualization_role == 'host' or (ansible_virtualization_type != 'lxc' and ansible_virtualization_type != 'systemd-nspawn')
- name: Set sysctl values - name: Set sysctl values
sysctl: sysctl:

@ -2,6 +2,7 @@
- name: Configure IPv4 Forwarding - name: Configure IPv4 Forwarding
sysctl: name="net.ipv4.ip_forward" value={{ net_ipv4_forward | ternary('1', '0') }} sysctl_file=/etc/sysctl.d/network.conf sysctl_set=yes state=present reload=yes sysctl: name="net.ipv4.ip_forward" value={{ net_ipv4_forward | ternary('1', '0') }} sysctl_file=/etc/sysctl.d/network.conf sysctl_set=yes state=present reload=yes
when: ansible_virtualization_type != 'systemd-nspawn'
- name: Deploy /etc/hosts - name: Deploy /etc/hosts
template: src=hosts.j2 dest=/etc/hosts template: src=hosts.j2 dest=/etc/hosts

Loading…
Cancel
Save