aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2016-04-27 13:57:21 +0200
committerCarlos Camacho <ccamacho@redhat.com>2016-06-21 12:20:11 +0200
commit296bffde893dbbf36c62d664e24e2584b89b8070 (patch)
treee245f2097bc70e0e92250afd6bd7f73bc33eb11f /puppet/manifests
parent71ede867ae281413d1ddd24d07867f34d32a76fa (diff)
Composable roles within services - NTP
Add NTP as a composable service. Also, the scope of this patch is to serve as basis for the blueprint related to the composable services walkthrough. This will be the use case documented. The puppet manifests updated to remove the current configuration for NTP is also added. Change-Id: I1d3d6229d53f48c380e6a775a7c50de8715fe949
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp4
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp4
2 files changed, 0 insertions, 8 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 6084c954..2bd3b4e3 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -28,10 +28,6 @@ if hiera('step') >= 1 {
if hiera('step') >= 2 {
- if count(hiera('ntp::servers')) > 0 {
- include ::ntp
- }
-
include ::timezone
# MongoDB
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 13271116..902e6686 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -59,10 +59,6 @@ if hiera('step') >= 1 {
include ::timezone
- if count(hiera('ntp::servers')) > 0 {
- include ::ntp
- }
-
$pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
$corosync_ipv6 = str2bool(hiera('corosync_ipv6', false))
if $corosync_ipv6 {