Merge pull request 'master' (!237) from adellam/ansible-roles:master into master
Reviewed-on: #237
This commit is contained in:
commit
719050e78e
|
@ -1,11 +1,11 @@
|
|||
---
|
||||
dependencies:
|
||||
- role: '../../library/roles/ubuntu-deb-general'
|
||||
- { role: '../../library/roles/cloud-init', when: ansible_product_name == "oVirt Node" }
|
||||
- role: '../../library/roles/sshd_config'
|
||||
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-rsyslog.git
|
||||
version: master
|
||||
name: rsyslog
|
||||
state: latest
|
||||
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-linux-firewall.git
|
||||
version: master
|
||||
name: linux-firewall
|
||||
|
@ -15,8 +15,7 @@ dependencies:
|
|||
name: letsencrypt-acme-sh-client
|
||||
state: latest
|
||||
when: letsencrypt_acme_install is defined and letsencrypt_acme_install
|
||||
- role: '../../library/roles/nagios'
|
||||
when: nagios_enabled is defined and nagios_enabled
|
||||
- { role: '../../library/roles/nagios', when: nagios_enabled is defined and nagios_enabled }
|
||||
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-zabbix-agent.git
|
||||
version: master
|
||||
name: zabbix-agent
|
||||
|
|
|
@ -22,7 +22,6 @@ centos_packages_to_install:
|
|||
- policycoreutils-python
|
||||
- firewalld
|
||||
- ipset
|
||||
- ntp
|
||||
- psmisc
|
||||
- tcpdump
|
||||
- tuned
|
||||
|
@ -37,8 +36,6 @@ centos_packages_from_epel:
|
|||
- htop
|
||||
- lbzip2
|
||||
|
||||
centos_ntpd_enabled: True
|
||||
|
||||
centos_packages_cleanup: True
|
||||
centos_remove_avahi: False
|
||||
centos_remove_networkmanager: False
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
---
|
||||
dependencies:
|
||||
- role: '../../library/centos/roles/external-repos'
|
||||
- role: '../../library/centos/roles/basic-setup'
|
||||
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-basic-system-setup.git
|
||||
- role: 'basic-system-setup'
|
||||
- src: git+https://code-repo.d4science.org/InfraScience/ansible-role-ntp.git
|
||||
version: master
|
||||
name: basic-system-setup
|
||||
name: ntp
|
||||
state: latest
|
||||
- role: '../../library/centos/roles/basic-setup'
|
||||
- role: '../../library/roles/motd'
|
||||
- role: '../../library/roles/linux-kernel-sysctl'
|
||||
- role: '../../library/centos/roles/tuned-setup'
|
||||
|
|
Loading…
Reference in New Issue