From 21a85d1c61a8836044803f916a07f753ca685892 Mon Sep 17 00:00:00 2001
From: Vitaly Gridnev <vgridnev@mirantis.com>
Date: Fri, 21 Aug 2015 12:14:26 +0300
Subject: [PATCH] Remove unneeded starting ntp

Starting ntp service in unneeded because it will be
started before.

Closes-bug: 1487465
Change-Id: Ic944f3e42e648e6513ce5f86effcadb57334f5da
---
 sahara/plugins/cdh/commands.py      | 8 --------
 sahara/plugins/cdh/plugin_utils.py  | 1 -
 sahara/plugins/cdh/v5/deploy.py     | 1 -
 sahara/plugins/cdh/v5_3_0/deploy.py | 1 -
 sahara/plugins/cdh/v5_4_0/deploy.py | 1 -
 5 files changed, 12 deletions(-)

diff --git a/sahara/plugins/cdh/commands.py b/sahara/plugins/cdh/commands.py
index 56fafa36..bcaaea41 100644
--- a/sahara/plugins/cdh/commands.py
+++ b/sahara/plugins/cdh/commands.py
@@ -52,14 +52,6 @@ def start_manager(remote):
     _root(remote, 'service cloudera-scm-server start')
 
 
-def start_ntp(remote):
-    distrib = _get_os_distrib(remote)
-    if distrib == 'centos':
-        _root(remote, 'service ntpd start')
-    elif distrib == 'ubuntu':
-        _root(remote, 'service ntp start')
-
-
 def configure_agent(remote, manager_address):
     remote.replace_remote_string('/etc/cloudera-scm-agent/config.ini',
                                  'server_host=.*',
diff --git a/sahara/plugins/cdh/plugin_utils.py b/sahara/plugins/cdh/plugin_utils.py
index e94bd2d2..ffeb60f4 100644
--- a/sahara/plugins/cdh/plugin_utils.py
+++ b/sahara/plugins/cdh/plugin_utils.py
@@ -237,7 +237,6 @@ class AbstractPluginUtils(object):
     def _start_cloudera_agent(self, instance):
         mng_hostname = self.get_manager(instance.cluster).hostname()
         with instance.remote() as r:
-            cmd.start_ntp(r)
             cmd.configure_agent(r, mng_hostname)
             cmd.start_agent(r)
 
diff --git a/sahara/plugins/cdh/v5/deploy.py b/sahara/plugins/cdh/v5/deploy.py
index 3c383ba9..b94938a8 100644
--- a/sahara/plugins/cdh/v5/deploy.py
+++ b/sahara/plugins/cdh/v5/deploy.py
@@ -46,7 +46,6 @@ PACKAGES = [
     'hive-server2',
     'hive-webhcat-server',
     'hue',
-    'ntp',
     'oozie',
     'oracle-j2sdk1.7',
     'spark-core',
diff --git a/sahara/plugins/cdh/v5_3_0/deploy.py b/sahara/plugins/cdh/v5_3_0/deploy.py
index e2c4dee3..54c1908f 100644
--- a/sahara/plugins/cdh/v5_3_0/deploy.py
+++ b/sahara/plugins/cdh/v5_3_0/deploy.py
@@ -45,7 +45,6 @@ PACKAGES = [
     'impala-state-store',
     'impala-catalog',
     'impala-shell',
-    'ntp',
     'oozie',
     'oracle-j2sdk1.7',
     'sentry',
diff --git a/sahara/plugins/cdh/v5_4_0/deploy.py b/sahara/plugins/cdh/v5_4_0/deploy.py
index ab0212d7..f90347c6 100644
--- a/sahara/plugins/cdh/v5_4_0/deploy.py
+++ b/sahara/plugins/cdh/v5_4_0/deploy.py
@@ -47,7 +47,6 @@ PACKAGES = [
     'impala-catalog',
     'impala-shell',
     'keytrustee-keyprovider',
-    'ntp',
     'oozie',
     'oracle-j2sdk1.7',
     'sentry',