Add undercloud-vm-ironic-source yaml file

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

diff --git a/Makefile b/Makefile
index 8e0d18f..7218381 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,24 @@
-NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml quantum.yaml mysql.yaml rabbitmq.yaml
+overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.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 overcloud-source.yaml swift-source.yaml > $@.tmp
+       mv $@.tmp $@
 
-notcompute.yaml: $(NOTCOMPUTE)
-       python merge.py --master-role notcompute --slave-roles stateless stateful -- $(NOTCOMPUTE) > notcompute.yaml
+undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-source.yaml
+       python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+       mv $@.tmp $@
 
-overcloud.yaml: bootstack-vm.yaml nova-compute-group.yaml
-       python merge.py bootstack-vm.yaml nova-compute-group.yaml > overcloud.yaml
+undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-source.yaml
+       python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+       mv $@.tmp $@
+
+undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tuskar-source.yaml
+       python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+       mv $@.tmp $@
+
+undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml ironic-source.yaml
+       python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+       mv $@.tmp $@
+
+test:
+       @bash test_merge.bash