X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=0d7d3f84c15e547d961a4bd7d4cabc839d74cc0f;hb=d3aa08dd5f3d82d9b4348b0341e63c42876e9c90;hp=6949b3a8f0476fc249c9d78bd25b9bde735c42f4;hpb=a0246928c7e395bfe4d25a397c415fab07892ad7;p=apex-tripleo-heat-templates.git

diff --git a/Makefile b/Makefile
index 6949b3a8..0d7d3f84 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,10 @@
-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
+	python merge.py $< > $@.tmp
+	mv $@.tmp $@
 
-notcompute.yaml: $(NOTCOMPUTE)
-	python merge.py --master-role notcompute --slave-roles stateless stateful -- $(NOTCOMPUTE) > notcompute.yaml
+undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml
+	python merge.py $^ > $@.tmp
+	mv $@.tmp $@
+
+test:
+	@bash test_merge.bash