From a4b5e9bb4510563d5bc52ca356a92bb6bab44dfc Mon Sep 17 00:00:00 2001
From: Oleksiy Molchanov <omolchanov@mirantis.com>
Date: Mon, 10 Aug 2015 17:24:25 +0300
Subject: [PATCH] Restrict ntp-client on controller nodes

NTP-client task shouldn't be run on controller multirole nodes

Change-Id: I54defe421ded251ad13b665b6fd1843600a517a7
Closes-Bug: 1481627
---
 .../osnailyfacter/modular/ntp/ntp-client.pp   | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp b/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp
index 214dad9a1e..4b178fd762 100644
--- a/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp
+++ b/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp
@@ -5,20 +5,21 @@ $ntp_servers             = hiera_array('ntp_servers', [$management_vrouter_vip])
 $nodes_hash              = hiera('nodes', {})
 $roles                   = node_roles($nodes_hash, hiera('uid'))
 
+if !(member($roles, 'controller') or member($roles, 'primary-controller')) {
+  class { 'ntp':
+    servers        => $ntp_servers,
+    service_ensure => 'running',
+    service_enable => true,
+    iburst_enable  => true,
+    tinker         => true,
+    panic          => '0',
+    stepout        => '5',
+    minpoll        => '3',
+  }
 
-class { 'ntp':
-  servers        => $ntp_servers,
-  service_ensure => 'running',
-  service_enable => true,
-  iburst_enable  => true,
-  tinker         => true,
-  panic          => '0',
-  stepout        => '5',
-  minpoll        => '3',
-}
-
-include ntp::params
-tweaks::ubuntu_service_override { 'ntpd':
-  package_name => $ntp::params::package_name,
-  service_name => $ntp::params::service_name,
+  include ntp::params
+  tweaks::ubuntu_service_override { 'ntpd':
+    package_name => $ntp::params::package_name,
+    service_name => $ntp::params::service_name,
+  }
 }