Add tuskar API service configuration

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

diff --git a/Makefile b/Makefile
index c03abea..0d7d3f8 100644 (file)
--- 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 $(NOTCOMPUTE) > notcompute.yaml
+undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml
+       python merge.py $^ > $@.tmp
+       mv $@.tmp $@
+
+test:
+       @bash test_merge.bash