CONTROLSCALE > 1 causes build to fail due to variable in the template.

[Julia Kreger]

The addition of a variable matching the variable that merge.py uses to expand for multiple controllers is resulting in the following when controlscale is set to anything above 1.

2014-08-07 12:42:12.896 | make: Entering directory `/opt/stack/new/tripleo-heat-templates'
2014-08-07 12:42:12.936 | python ./tripleo_heat_merge/merge.py --hot --scale NovaCompute=${COMPUTESCALE:-'1'} --scale controller=${CONTROLSCALE:-'1'} --scale SwiftStorage=${SWIFTSTORAGESCALE='0'} --scale BlockStorage=${BLOCKSTORAGESCALE='0'} overcloud-source.yaml block-storage.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml swift-deploy.yaml nova-compute-config.yaml > overcloud.yaml.tmp
2014-08-07 12:42:16.066 | Traceback (most recent call last):
2014-08-07 12:42:16.107 | File "./tripleo_heat_merge/merge.py", line 422, in <module>
2014-08-07 12:42:16.108 | main()
2014-08-07 12:42:16.108 | File "./tripleo_heat_merge/merge.py", line 276, in main
2014-08-07 12:42:16.108 | change_image_params=args.change_image_params)
2014-08-07 12:42:16.109 | File "./tripleo_heat_merge/merge.py", line 383, in merge
2014-08-07 12:42:16.109 | end_template = apply_scaling(end_template, scaling)
2014-08-07 12:42:16.109 | File "./tripleo_heat_merge/merge.py", line 100, in apply_scaling
2014-08-07 12:42:16.110 | new_value = apply_scaling(value, scaling, in_copies)
2014-08-07 12:42:16.110 | File "./tripleo_heat_merge/merge.py", line 100, in apply_scaling
2014-08-07 12:42:16.110 | new_value = apply_scaling(value, scaling, in_copies)
2014-08-07 12:42:16.111 | File "./tripleo_heat_merge/merge.py", line 106, in apply_scaling
2014-08-07 12:42:16.111 | assert len(new_values) == 1
2014-08-07 12:42:16.111 | AssertionError
2014-08-07 12:42:16.112 | make: *** [overcloud.yaml] Error 1
2014-08-07 12:42:16.112 | make: Leaving directory `/opt/stack/new/tripleo-heat-templates'

I was able to trace this back to the parameter BootstrapNodeResource which has a default value of 'controller0'. Changing the input to anything else results in the yaml to parse correctly without errors.

[Julia Kreger (juliaashleykreger)]

Issue resolved in commit a5413281e08b7cf9dd4648d4f31b7593d7dd4c0a.