commit f7ff475de12079b7225745392ad2ef2dc577af2e
author Martin Polreich <polreichmartin@gmail.com> Mon Oct 14 13:13:41 2019 +0200
committer Martin Polreich <mpolreich@mirantis.com> Mon Oct 14 14:30:08 2019 +0000
tree 0ec55e52bddd8c26abd878512f9c459c866e36b0
parent 7de9b07ebf24ff0d6f66895b3e2d6eac7b39744a

Fix missing time units for haproxy timeout

	- if unit is missing, assume 'ms' and append it
	- otherwise use param as is
	- also fix sample pillars in README
	- add timeout params to test pillars

Fixes: PROD-33213

Change-Id: Ie5074b6df0d05ff690d9b60046b58c0585ade437
(cherry picked from commit 3c7dd06058aadf209cfdbb98139a8f0146e5be8d)

tests/pillar/single_general_service.sls

diff --git a/tests/pillar/single_general_service.sls b/tests/pillar/single_general_service.sls
index 244655c..578f07c 100644
--- a/tests/pillar/single_general_service.sls
+++ b/tests/pillar/single_general_service.sls
@@ -10,6 +10,10 @@
       3: 2
       4: 3
     stats_bind_process: "1 2"
+    timeout:
+      connect: 5000ms
+      client: 50000ms
+      server: 50000ms
     listen:
       glance_registry:
         binds: