From d24aa1ae0207c7a3d9ba6c297acaaa4bcc54e5f0 Mon Sep 17 00:00:00 2001
From: Vladimir Kuklin <vkuklin@mirantis.com>
Date: Thu, 28 Jan 2016 18:56:25 +0300
Subject: [PATCH] Wrap ntpdate to better timeout

Change-Id: Ia478c28695cba83c62c9091a5788ca74e1c4534e
Partial-Bug: #1533082
---
 deployment/puppet/osnailyfacter/modular/astute/tasks.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
index 596d23aa09..c4652153b5 100644
--- a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
@@ -226,10 +226,10 @@
   requires: [pre_deployment_start]
   required_for: [pre_deployment_end]
   parameters:
-    cmd: timeout --foreground --preserve-status 30 ntpdate -u -v -s $(awk '/^server/ { if ($2 !~ /127\.127\.[0-9]+\.[0-9]+/) {ORS=" "; print $2}}' /etc/ntp.conf)
+    cmd: timeout -s9 40 ntpdate -u -v -s $(awk '/^server/ { if ($2 !~ /127\.127\.[0-9]+\.[0-9]+/) {ORS=" "; print $2}}' /etc/ntp.conf)
     retries: 10
     interval: 30
-    timeout: 180
+    timeout: 300
 
 - id: pre_hiera_config
   type: puppet