From: Steven Dake <sdake@redhat.com>
Date: Mon, 17 Sep 2012 19:51:21 +0000 (-0700)
Subject: Fix backtrace when using loadbalancer
X-Git-Tag: 2014.1~1394
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c5d512465979d0c3851352736ca0acc7091722a6;p=openstack-build%2Fheat-build.git

Fix backtrace when using loadbalancer

Loadbalancer incorrectly tried to reference a string as an integer.

This resulted in the following typeerror which is repaired by
thi patch:

    timeout_check = 'timeout check %ds' % (health_chk['Timeout'])
TypeError: %d format: a number is required, not unicode

Fixes issue #240

Change-Id: I7e2697200d3fa9b0cb009f3a7898d487b70fc23a
Signed-off-by: Steven Dake <sdake@redhat.com>
---

diff --git a/heat/engine/loadbalancer.py b/heat/engine/loadbalancer.py
index bedeedfb..fab1e67f 100644
--- a/heat/engine/loadbalancer.py
+++ b/heat/engine/loadbalancer.py
@@ -257,7 +257,7 @@ class LoadBalancer(stack.Stack):
                     health_chk['Interval'],
                     health_chk['UnhealthyThreshold'],
                     health_chk['HealthyThreshold'])
-            timeout_check = 'timeout check %ds' % (health_chk['Timeout'])
+            timeout_check = 'timeout check %ds' % int(health_chk['Timeout'])
         else:
             check = ''
             timeout_check = ''