-overcloud-with-block-storage-nfs.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml nfs-server-source.yaml block-storage-nfs.yaml
- # $^ 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 BlockStorage=$${CINDERSCALE:-'1'} overcloud-source.yaml swift-source.yaml nfs-server-source.yaml block-storage-nfs.yaml > $@.tmp
- mv $@.tmp $@
-
-undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-source.yaml
- python ./tripleo_heat_merge/merge.py $^ > $@.tmp
- mv $@.tmp $@
-
-undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-source.yaml
- python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-nova-config.yaml undercloud-vm-nova-deploy.yaml
+ python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp