From f000b383189c5e65769a846f64662b662ade5b27 Mon Sep 17 00:00:00 2001
From: Dougal Matthews <dougal@redhat.com>
Date: Thu, 16 Jul 2015 14:20:24 +0100
Subject: [PATCH] Check both THT and Tuskar parmaters for the number of
 controllers

Change-Id: I40c33394413920d359b542a463dbe02410d30cbb
---
 rdomanager_oscplugin/v1/overcloud_deploy.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rdomanager_oscplugin/v1/overcloud_deploy.py b/rdomanager_oscplugin/v1/overcloud_deploy.py
index 88f0f4954..7fefe949c 100644
--- a/rdomanager_oscplugin/v1/overcloud_deploy.py
+++ b/rdomanager_oscplugin/v1/overcloud_deploy.py
@@ -274,7 +274,11 @@ class DeployOvercloud(command.Command):
                 parameters[param] = getattr(args, arg)
 
         # Scaling needs extra parameters
-        number_controllers = parameters.get('Controller-1::count')
+        number_controllers = max((
+            parameters.get('ControllerCount', 0),
+            parameters.get('Controller-1::count', 0)
+        ))
+
         if number_controllers and number_controllers > 1:
             if args.templates:
                 parameters.update({