From 9ffb18af9421070fffb9375f1fc5e4c94ede0fde Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Tue, 28 Jan 2014 19:39:43 +1300 Subject: Update overcloud to support N compute hosts. This uses the new merge feature earlier in this series. Exporting COMPUTESCALE before running make will build a different template. Note that since Make doesn't depend on variable values, you need to delete overcloud.yaml between building with different scales. Change-Id: If05b99ae3596bcc794e3a899ab1443aeb14ec754 --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d7fc543a..2c9c2c0e 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,10 @@ overcloud_source_deps = nova-compute-instance.yaml all: $(generated_templates) +# Note that COMPUTESCALE is not a physical dep - 'make overcloud.yaml' won't do +# the right thing if you change COMPUTESCALE from one run to another. overcloud.yaml: overcloud-source.yaml swift-source.yaml ssl-source.yaml $(overcloud_source_deps) - python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml ssl-source.yaml > $@.tmp + python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'} overcloud-source.yaml swift-source.yaml ssl-source.yaml > $@.tmp mv $@.tmp $@ overcloud-with-block-storage.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml block-storage.yaml -- cgit 1.2.3-korg