tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'Some dependencies have now their own repository.' (#226) from adellam/ansible-roles:master into master

This commit is contained in:
Andrea Dell'Amico 2020-07-19 18:38:31 +02:00
parent 93b3f38993 481705b058
commit b92d888420
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/bootstrap-roles/centos-common/meta/main.yml
View File

@ -1,11 +1,15 @@
---
dependencies:
- role: '../../library/centos/roles/centos-bootstrap'
- role: '../../library/roles/rsyslog'
- role: '../../library/roles/dell-server-utilities'
- role: '../../library/roles/sshd_config'
- { 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/postfix-relay', when: postfix_relay_client is defined and postfix_relay_client }
- role: '../../library/roles/sshd_config'
- role: '../../library/centos/roles/fail2ban'
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-rsyslog.git
version: master
name: rsyslog
state: latest
- role: '../../library/roles/dell-server-utilities'
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-linux-firewall.git
version: master
name: linux-firewall
@ -19,6 +23,8 @@ dependencies:
name: zabbix-agent
state: latest
when: zabbix_agent_install is defined and zabbix_agent_install
- role: '../../library/centos/roles/fail2ban'
- { role: '../../library/roles/cloud-init', when: ansible_product_name == "oVirt Node" }
- { role: '../../library/centos/roles/prometheus-node-exporter', when: prometheus_enabled }
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-prometheus-node-exporter.git
version: master
name: prometheus-node-exporter
state: latest
when: prometheus_enabled is defined and prometheus_enabled

23
library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
View File

@ -1,22 +1,29 @@
---
dependencies:
- role: '../../library/roles/ubuntu-deb-general'
- role: '../../library/roles/rsyslog'
- { role: '../../library/roles/cloud-init', when: ansible_product_name == "oVirt Node" }
- role: '../../library/roles/tmpreaper'
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-linux-firewall.git
version: master
name: linux-firewall
state: latest
- { 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/sshd_config'
- role: '../../library/roles/tmpreaper'
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-letsencrypt-acme-sh-client.git
version: master
name: letsencrypt-acme-sh-client
state: latest
- 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
state: latest
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-zabbix-agent.git
version: master
name: zabbix-agent
state: latest
when: zabbix_agent_install is defined and zabbix_agent_install
- { role: '../../library/roles/prometheus-node-exporter', when: prometheus_enabled is defined and prometheus_enabled }
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-prometheus-node-exporter.git
version: master
name: prometheus-node-exporter
state: latest
when: prometheus_enabled is defined and prometheus_enabled