From 51ff938a01e09e6528b2275f3e64a726b2c28c48 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 19 May 2020 17:06:13 +0200 Subject: [PATCH] Use the remote letsencrypt role. --- library/bootstrap-roles/centos-common/meta/main.yml | 7 ++----- library/bootstrap-roles/deb-ubuntu-common/meta/main.yml | 9 ++------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/library/bootstrap-roles/centos-common/meta/main.yml b/library/bootstrap-roles/centos-common/meta/main.yml index 08cffda9..7977f760 100644 --- a/library/bootstrap-roles/centos-common/meta/main.yml +++ b/library/bootstrap-roles/centos-common/meta/main.yml @@ -9,9 +9,6 @@ dependencies: - role: '../../library/centos/roles/firewalld' - role: '../../library/centos/roles/fail2ban' - { role: '../../library/roles/cloud-init', when: ansible_product_name == "oVirt Node" } - - { role: '../../library/roles/letsencrypt-acme-sh-client', when: letsencrypt_acme_sh_install is defined and letsencrypt_acme_sh_install } + - { role: 'letsencrypt-acme-sh-client', when: letsencrypt_acme_sh_install is defined and letsencrypt_acme_sh_install } + - { role: 'zabbix-agent', when: zabbix_agent_install is defined and zabbix_agent_install } - { role: '../../library/centos/roles/prometheus-node-exporter', when: prometheus_enabled } - - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-zabbix-agent.git - version: master - name: zabbix-agent - when: zabbix_agent_install | bool diff --git a/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml b/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml index b980565f..a4cc33f3 100644 --- a/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml +++ b/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml @@ -7,11 +7,6 @@ dependencies: - role: '../../library/roles/iptables' - { role: '../../library/roles/data_disk', when: additional_disks is defined and additional_disks } - role: '../../library/roles/sshd_config' - - { role: '../library/roles/letsencrypt-acme-sh-client', when: letsencrypt_acme_sh_install is defined and letsencrypt_acme_sh_install } - - { role: '../../library/roles/nagios', when: nagios_enabled is defined and nagios_enabled } + - { role: 'letsencrypt-acme-sh-client', when: letsencrypt_acme_sh_install is defined and letsencrypt_acme_sh_install } + - { role: 'zabbix-agent', 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-zabbix-agent.git - version: master - name: zabbix-agent - when: zabbix_agent_install | bool -