From cae5f726df0bdf12c9ac4b5e528a2c946c1d26f7 Mon Sep 17 00:00:00 2001
From: ahothan <ahothan@cisco.com>
Date: Wed, 13 Jun 2018 13:08:12 -0700
Subject: [PATCH] Add support for configurable redis server ready timeout

https://bugs.launchpad.net/kloudbuster/+bug/1766373

Change-Id: Icc367ec52e7d61e5729220eee3a8753b228f4a09
Signed-off-by: ahothan <ahothan@cisco.com>
---
 kloudbuster/cfg.scale.yaml | 11 +++++++----
 kloudbuster/kloudbuster.py |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kloudbuster/cfg.scale.yaml b/kloudbuster/cfg.scale.yaml
index 7d826f3..52ddff4 100644
--- a/kloudbuster/cfg.scale.yaml
+++ b/kloudbuster/cfg.scale.yaml
@@ -15,7 +15,7 @@ openrc_file:
 
 # Name of the image to use for all test VMs (client, server and proxy)
 # without the qcow2 extension
-# 
+#
 # Leave empty to use the default test VM image (recommended).
 # If non empty use quotes if there are space characters in the name (e.g. 'my image')
 # The default test VM image is named "kloudbuster-<version>" where
@@ -28,9 +28,9 @@ image_name:
 #
 # To upload the image, download it first to a local file system before running kloudbuster
 # Fill with the full pathname of the image with qcow2 extension
-# e.g. 
+# e.g.
 # vm_image_file: /kloudbuster/kloudbuster-7.0.0.qcow2
-# If empty, KloudBuster will attempt to locate that file (with the default name) 
+# If empty, KloudBuster will attempt to locate that file (with the default name)
 # under the following directories:
 # - root of the kloudbuster package
 # - current directory
@@ -85,6 +85,9 @@ tsdb:
     # TSDB server port
     server_port: 9090
 
+# Maximum time allowed for the Proxy Redis server to get ready in seconds
+proxy_timeout_sec: 120
+
 # ==================================================
 # SERVER SIDE CONFIG OPTIONS (HTTP SERVER SIDE ONLY)
 # ==================================================
@@ -149,7 +152,7 @@ client:
         disk: 0
         # metadata are supported and can be added if needed
         # example:
-        #extra_specs: 
+        #extra_specs:
             #"hw:cpu_policy": dedicated
 
     # Assign floating IP for every client side test VM
diff --git a/kloudbuster/kloudbuster.py b/kloudbuster/kloudbuster.py
index 362a8fe..3eaa28d 100755
--- a/kloudbuster/kloudbuster.py
+++ b/kloudbuster/kloudbuster.py
@@ -615,7 +615,8 @@ class KloudBuster(object):
             self.kb_runner = KBRunner_HTTP(client_list, self.client_cfg,
                                            self.single_cloud)
 
-        self.kb_runner.setup_redis(self.kb_proxy.fip_ip or self.kb_proxy.fixed_ip)
+        self.kb_runner.setup_redis(self.kb_proxy.fip_ip or self.kb_proxy.fixed_ip,
+                                   timeout=self.client_cfg.proxy_timeout_sec)
         if self.client_cfg.progression['enabled'] and not self.multicast_mode:
             log_info = "Progression run is enabled, KloudBuster will schedule " \
                        "multiple runs as listed:"