X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=295e85c55b8757dcb6ed5c2eab0783b22a409094;hb=beca15dec5265783047d5df210b270ed3d77dd4b;hp=ad93ff037bcfe205f6593781ce757e147bdfc3a0;hpb=793dd12964962cda1e939705ea47a1a29f21ca70;p=apex-tripleo-heat-templates.git

diff --git a/Makefile b/Makefile
index ad93ff03..295e85c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,47 @@
-NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml neutron.yaml mysql.yaml rabbitmq.yaml
+generated_templates =                         \
+        overcloud.yaml                        \
+        overcloud-with-block-storage-nfs.yaml \
+        undercloud-vm.yaml                    \
+        undercloud-bm.yaml                    \
+        undercloud-vm-ironic.yaml
 
-notcompute.yaml: $(NOTCOMPUTE)
-	python merge.py --master-role notcompute --slave-roles stateless stateful -- $^ > notcompute.yaml
+# Files included in overcloud-source.yaml via FileInclude
+overcloud_source_deps = nova-compute-instance.yaml
 
-overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml
-	python merge.py $< > $@.tmp
+all: $(generated_templates)
+VALIDATE := $(patsubst %,validate-%,$(generated_templates))
+validate-all: $(VALIDATE)
+$(VALIDATE):
+	heat template-validate -f $(subst validate-,,$@)
+
+overcloud.yaml: overcloud-source.yaml block-storage.yaml swift-deploy.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml nova-compute-config.yaml $(overcloud_source_deps)
+	python ./tripleo_heat_merge/merge.py --hot --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE='0'} --scale BlockStorage=$${BLOCKSTORAGESCALE='0'} overcloud-source.yaml block-storage.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml swift-deploy.yaml nova-compute-config.yaml > $@.tmp
+	mv $@.tmp $@
+
+overcloud-with-block-storage-nfs.yaml: overcloud-source.yaml block-storage-nfs.yaml nfs-server-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml $(overcloud_source_deps)
+	# $^ 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 --hot --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE='0'} --scale BlockStorage=$${BLOCKSTORAGESCALE:-'1'} overcloud-source.yaml block-storage-nfs.yaml nfs-server-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml > $@.tmp
+	mv $@.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
+	mv $@.tmp $@
+
+undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-nova-config.yaml undercloud-bm-nova-deploy.yaml
+	python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
 	mv $@.tmp $@
+
+undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-config.yaml undercloud-vm-ironic-deploy.yaml
+	python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
+	mv $@.tmp $@
+
+check: test
+
+test:
+	@bash test_merge.bash
+
+clean:
+	rm -f $(generated_templates)
+
+.PHONY: clean overcloud.yaml check