Check both THT and Tuskar parmaters for the number of controllers

Change-Id: I40c33394413920d359b542a463dbe02410d30cbb

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({