openstack/python-tripleoclient
Code Issues Proposed changes

Check both THT and Tuskar parmaters for the number of controllers

Browse Source 
Change-Id: I40c33394413920d359b542a463dbe02410d30cbb
This commit is contained in:
Dougal Matthews
2015-07-16 14:20:24 +01:00
parent 4c93faedb1
commit f000b38318
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rdomanager_oscplugin/v1/overcloud_deploy.py
View File

@@ -274,7 +274,11 @@ class DeployOvercloud(command.Command):
parameters[param] = getattr(args, arg) parameters[param] = getattr(args, arg)
# Scaling needs extra parameters # 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 number_controllers and number_controllers > 1:
if args.templates: if args.templates:
parameters.update({ parameters.update({