From 481705b058884a5292aa0e4b7411f835a33d1817 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Sun, 19 Jul 2020 18:37:49 +0200
Subject: [PATCH] Some dependencies have now their own repository.
---
.../centos-common/meta/main.yml | 20 ++++++++++------
.../deb-ubuntu-common/meta/main.yml | 23 ++++++++++++-------
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/library/bootstrap-roles/centos-common/meta/main.yml b/library/bootstrap-roles/centos-common/meta/main.yml
index 615739d8..dbfcb21c 100644
--- a/library/bootstrap-roles/centos-common/meta/main.yml
+++ b/library/bootstrap-roles/centos-common/meta/main.yml
@@ -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
diff --git a/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml b/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
index f3d25fc9..8ea013a8 100644
--- a/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
+++ b/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
@@ -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