X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=4f94ff6de434e4466ac879c8dac965cfedd904f9;hb=d44a3e2342bc14754c8bb70c4a4559d563d355c0;hp=c03abea4262d40e0ef9360c594bb65d032918e7e;hpb=022cc12afc82cbc9387a428d6ecc4a1f08979e9f;p=apex-tripleo-heat-templates.git

diff --git a/Makefile b/Makefile
index c03abea4..4f94ff6d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,48 @@
-NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml quantum.yaml mysql.yaml rabbitmq.yaml
+generated_templates =                         \
+        overcloud.yaml                        \
+        overcloud-with-block-storage-nfs.yaml \
+        undercloud-vm.yaml                    \
+        undercloud-bm.yaml                    \
+        undercloud-vm-tuskar.yaml             \
+        undercloud-vm-ironic.yaml
 
-notcompute.yaml: $(NOTCOMPUTE)
-	python merge.py $(NOTCOMPUTE) > notcompute.yaml
+# Files included in overcloud-source.yaml via FileInclude
+overcloud_source_deps = nova-compute-instance.yaml
+
+all: $(generated_templates)
+
+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 --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 --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-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
+	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