Merge "Fix Merge::Map for scatter-gather in Configs."

[apex-tripleo-heat-templates.git] / Makefile

diff --git a/Makefile b/Makefile
index d7fc543..75b8a4a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ overcloud_source_deps = nova-compute-instance.yaml
 all: $(generated_templates)
 
 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
@@ -36,8 +36,12 @@ undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.ya
        python ./tripleo_heat_merge/merge.py $^ > $@.tmp
        mv $@.tmp $@
 
+check: test
+
 test:
        @bash test_merge.bash
 
 clean:
        rm -f $(generated_templates)
+
+.PHONY: clean overcloud.yaml check