From e2f7392c4ad777fc19492e6dbe07238c316d70a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Fri, 28 Sep 2018 08:43:10 +0200
Subject: [PATCH] Use Timesync service instead of Ntp
At the moment the 'OS::TripleO::Services::Timesync' service is
synonymous to 'OS::TripleO::Services::Ntp'. Let's use the more generic
Timesync service to pick up the new default in the event the value for
'OS::TripleO::Services::Timesync' changes.
This better aligns with the rest of the roles.
Change-Id: I44f706ce7dd1909ffd3805337fc6d9a5ce6de80f
---
roles/OpenShiftAllInOne.yaml | 2 +-
roles/OpenShiftInfra.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/OpenShiftAllInOne.yaml b/roles/OpenShiftAllInOne.yaml
index 9e2e48c027..82921dc773 100644
--- a/roles/OpenShiftAllInOne.yaml
+++ b/roles/OpenShiftAllInOne.yaml
@@ -22,7 +22,6 @@
default_route_networks: ['External']
ServicesDefault:
- OS::TripleO::Services::Docker
- - OS::TripleO::Services::Ntp
- OS::TripleO::Services::OpenShift::GlusterFS
- OS::TripleO::Services::OpenShift::Infra
- OS::TripleO::Services::OpenShift::Master
@@ -30,6 +29,7 @@
- OS::TripleO::Services::Podman
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Sshd
+ - OS::TripleO::Services::Timesync
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::TripleoPackages
diff --git a/roles/OpenShiftInfra.yaml b/roles/OpenShiftInfra.yaml
index a60f7f848d..de52d6ec36 100644
--- a/roles/OpenShiftInfra.yaml
+++ b/roles/OpenShiftInfra.yaml
@@ -19,9 +19,9 @@
default_route_networks: ['ControlPlane']
ServicesDefault:
- OS::TripleO::Services::Docker
- - OS::TripleO::Services::Ntp
- OS::TripleO::Services::OpenShift::GlusterFS
- OS::TripleO::Services::OpenShift::Infra
- OS::TripleO::Services::Podman
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Sshd
+ - OS::TripleO::Services::Timesync