Merge "Add Controller scale param to merge.py"

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

diff --git a/Makefile b/Makefile
index 4f94ff6..2bb095a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,11 @@ overcloud-with-block-storage-nfs.yaml: overcloud-source.yaml block-storage-nfs.y
        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 $@
 
-undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-source.yaml
+undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-nova-config.yaml undercloud-bm-nova-deploy.yaml
        python ./tripleo_heat_merge/merge.py $^ > $@.tmp
        mv $@.tmp $@
 
@@ -33,7 +33,7 @@ undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tusk
        python ./tripleo_heat_merge/merge.py $^ > $@.tmp
        mv $@.tmp $@
 
-undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml
+undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-config.yaml undercloud-vm-ironic-deploy.yaml
        python ./tripleo_heat_merge/merge.py $^ > $@.tmp
        mv $@.tmp $@