X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=75b8a4a5ec9b36da5ea23313f85b3115388fcf34;hb=c12483397cd1483ebe09a422477ac42a32bd9005;hp=8e0d18f4370b42a22c37ca3e1db20db054babd31;hpb=6529485a2af4075742dd23846a5fef68a9e8bd4c;p=apex-tripleo-heat-templates.git

diff --git a/Makefile b/Makefile
index 8e0d18f4..75b8a4a5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,47 @@
-NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml quantum.yaml mysql.yaml rabbitmq.yaml
+generated_templates =                \
+        overcloud.yaml               \
+        undercloud-vm.yaml           \
+        undercloud-bm.yaml           \
+        undercloud-vm-tuskar.yaml    \
+        undercloud-vm-ironic.yaml
 
-notcompute.yaml: $(NOTCOMPUTE)
-	python merge.py --master-role notcompute --slave-roles stateless stateful -- $(NOTCOMPUTE) > notcompute.yaml
+# Files included in overcloud-source.yaml via FileInclude
+overcloud_source_deps = nova-compute-instance.yaml
 
-overcloud.yaml: bootstack-vm.yaml nova-compute-group.yaml
-	python merge.py bootstack-vm.yaml nova-compute-group.yaml > overcloud.yaml
+all: $(generated_templates)
+
+overcloud.yaml: overcloud-source.yaml swift-source.yaml ssl-source.yaml $(overcloud_source_deps)
+	python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'} overcloud-source.yaml swift-source.yaml ssl-source.yaml > $@.tmp
+	mv $@.tmp $@
+
+overcloud-with-block-storage.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml block-storage.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 block-storage.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
+	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 $@
+
+check: test
+
+test:
+	@bash test_merge.bash
+
+clean:
+	rm -f $(generated_templates)
+
+.PHONY: clean overcloud.yaml check