From 72bcfc579ba6ac93e8fb9866786689126f3e7ef1 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Thu, 22 Jul 2021 16:58:15 +0200
Subject: [PATCH 1/2] External role for ntp.

---
 library/bootstrap-roles/deb-ubuntu-common/meta/main.yml | 5 ++---
 library/centos/roles/centos-bootstrap/meta/main.yml     | 7 ++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml b/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
index b626a91..7f551d0 100644
--- a/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
+++ b/library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
@@ -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
diff --git a/library/centos/roles/centos-bootstrap/meta/main.yml b/library/centos/roles/centos-bootstrap/meta/main.yml
index 9a7bfe1..60f82ed 100644
--- a/library/centos/roles/centos-bootstrap/meta/main.yml
+++ b/library/centos/roles/centos-bootstrap/meta/main.yml
@@ -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'
-- 
2.17.1


From 0159d76b205108e9b8e3c6642a470ac379b031d1 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Thu, 22 Jul 2021 17:00:14 +0200
Subject: [PATCH 2/2] Remove the installation of ntp from basic-setup.

---
 library/centos/roles/basic-setup/defaults/main.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/library/centos/roles/basic-setup/defaults/main.yml b/library/centos/roles/basic-setup/defaults/main.yml
index 2b99785..934bdee 100644
--- a/library/centos/roles/basic-setup/defaults/main.yml
+++ b/library/centos/roles/basic-setup/defaults/main.yml
@@ -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
-- 
2.17.1