additional disks and tmpreaper are now part of the basic-system-setup role. #231

Manually merged
adellam merged 1 commits from adellam/ansible-roles:master into master 2020-10-29 18:32:11 +01:00
7 changed files with 0 additions and 77 deletions

View File

@ -2,7 +2,6 @@
dependencies: dependencies:
- role: '../../library/centos/roles/centos-bootstrap' - role: '../../library/centos/roles/centos-bootstrap'
- { role: '../../library/roles/cloud-init', when: ansible_product_name == "oVirt Node" } - { role: '../../library/roles/cloud-init', when: ansible_product_name == "oVirt Node" }
- { role: '../../library/roles/data_disk', when: additional_disks is defined and additional_disks }
- role: '../../library/roles/sshd_config' - role: '../../library/roles/sshd_config'
- role: '../../library/centos/roles/fail2ban' - role: '../../library/centos/roles/fail2ban'
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-rsyslog.git - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-rsyslog.git

View File

@ -1,10 +1,8 @@
--- ---
dependencies: dependencies:
- role: '../../library/roles/ubuntu-deb-general' - role: '../../library/roles/ubuntu-deb-general'
- { role: '../../library/roles/data_disk', when: additional_disks is defined and additional_disks }
- { role: '../../library/roles/cloud-init', when: ansible_product_name == "oVirt Node" } - { role: '../../library/roles/cloud-init', when: ansible_product_name == "oVirt Node" }
- role: '../../library/roles/sshd_config' - role: '../../library/roles/sshd_config'
- role: '../../library/roles/tmpreaper'
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-letsencrypt-acme-sh-client.git - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-letsencrypt-acme-sh-client.git
version: master version: master
name: letsencrypt-acme-sh-client name: letsencrypt-acme-sh-client

View File

@ -1,7 +0,0 @@
---
#
# Define the following variables to manage additional disks and mount points
additional_disks: False
#disks_and_mountpoints_list:
# - { mountpoint: '/data', device: 'xvda3', fstype: 'xfs', opts: 'noatime', state: 'mounted', create_filesystem: True }

View File

@ -1,25 +0,0 @@
---
- block:
- name: Create a file system on the new disks
filesystem: dev=/dev/{{ item.device }} fstype={{ item.fstype }} force=no
with_items: '{{ disks_and_mountpoints_list | default([]) }}'
when:
- additional_disks
- item.create_filesystem
- name: Install the NFS client utilities when we are going to mount a NFS file system
apt: pkg=nfs-common state=present update_cache=yes cache_valid_time=1800
with_items: '{{ disks_and_mountpoints_list | default([]) }}'
when: item.fstype == 'nfs'
- name: Install the NFS 4 acl tools when we are going to mount a NFS file system
apt: pkg=nfs4-acl-tools state=present update_cache=yes cache_valid_time=1800
with_items: '{{ disks_and_mountpoints_list | default([]) }}'
when: item.fstype == 'nfs'
- name: Manage the additional file systems
mount: name={{ item.mountpoint }} src={{ item.root_device | default('/dev') }}/{{ item.device }} fstype={{ item.fstype }} opts={{ item.opts }} state={{ item.state }}
with_items: '{{ disks_and_mountpoints_list | default([]) }}'
when: additional_disks
tags: [ 'data_disk', 'mountpoint' ]

View File

@ -1,8 +0,0 @@
---
tmpreaper_install: False
tmpreaper_protect_extra: ''
tmpreaper_dirs: '/tmp/.'
tmpreaper_delay: '256'
tmpreaper_additional_options: ''
tmpreaper_time: '7d'

View File

@ -1,27 +0,0 @@
---
- name: Install tmpreaper on Debian/Ubuntu
block:
- name: Install tmpreaper
apt: pkg=tmpreaper state=latest cache_valid_time=1800
- name: Install the tmpreaper configuration
template: src=tmpreaper.conf.j2 dest=/etc/tmpreaper.conf owner=root group=root mode=0444
when:
- tmpreaper_install | bool
- ansible_distribution_file_variety == "Debian"
tags: tmpreaper
- name: Remove tmpreaper on Debian/Ubuntu
block:
- name: Remove the tmpreaper package
apt: pkg=tmpreaper state=absent
- name: Remove the tmpreaper configuration
file: dest=/etc/tmpreaper.conf state=absent
when:
- not tmpreaper_install | bool
- ansible_distribution_file_variety == "Debian"
tags: tmpreaper

View File

@ -1,7 +0,0 @@
#
TMPREAPER_TIME={{ tmpreaper_time }}
TMPREAPER_PROTECT_EXTRA='{{ tmpreaper_protect_extra }}'
TMPREAPER_DIRS='{{ tmpreaper_dirs }}'
TMPREAPER_DELAY='{{ tmpreaper_delay }}'
TMPREAPER_ADDITIONALOPTIONS='{{ tmpreaper_additional_options }}'