From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 6 Jun 2014 15:13:50 +0000 (+0000)
Subject: Merge "Add Controller scale param to merge.py"
X-Git-Tag: opnfv-6.0.0~2821
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=35306f4095e23e71ae8c1edddb01a37ad3af19fa;p=apex-tripleo-heat-templates.git

Merge "Add Controller scale param to merge.py"
---

35306f4095e23e71ae8c1edddb01a37ad3af19fa
diff --cc Makefile
index 29e25b3d,4f94ff6d..2bb095a8
--- a/Makefile
+++ b/Makefile
@@@ -18,10 -18,10 +18,10 @@@ overcloud.yaml: overcloud-source.yaml b
  overcloud-with-block-storage-nfs.yaml: overcloud-source.yaml block-storage-nfs.yaml nfs-server-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml $(overcloud_source_deps)
  	# $^ won't work here because we want to list nova-compute-instance.yaml as
  	# a prerequisite but don't want to pass it into merge.py
- 	python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE='0'} --scale BlockStorage=$${BLOCKSTORAGESCALE:-'1'} overcloud-source.yaml block-storage-nfs.yaml nfs-server-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml > $@.tmp
+ 	python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE='0'} --scale BlockStorage=$${BLOCKSTORAGESCALE:-'1'} overcloud-source.yaml block-storage-nfs.yaml nfs-server-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml > $@.tmp
  	mv $@.tmp $@
  
 -undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-source.yaml
 +undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-nova-config.yaml undercloud-vm-nova-deploy.yaml
  	python ./tripleo_heat_merge/merge.py $^ > $@.tmp
  	mv $@.tmp $@