summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2014-01-28 19:39:43 +1300
committerRobert Collins <rbtcollins@hp.com>2014-01-31 11:23:03 +1300
commit9ffb18af9421070fffb9375f1fc5e4c94ede0fde (patch)
tree2f257cfdd0748932b1942fc3d3da348d4026d02f /Makefile
parent8f842e60bf1f7c85b4ff403263076e3284b22b8a (diff)
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
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