X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=6ead70828b53cf7a29205e4a666b468372cd199c;hb=1ca7efc5d18c4b5ba5f53753dcfbbe790c42aaad;hp=534cd0f0865a9dd4237b29738bb63fafaafaf474;hpb=3167fb44f01fa15b9cd482d089fca3f41bb607f9;p=apex-tripleo-heat-templates.git

diff --git a/Makefile b/Makefile
index 534cd0f0..6ead7082 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,49 @@
-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             \
+        undercloud-vm-ironic-vlan.yaml
 
-notcompute.yaml: $(NOTCOMPUTE)
-	python merge.py --master-role notcompute --slave-roles stateless stateful -- $^ > notcompute.yaml
+# Files included in deprecated/overcloud-source.yaml via FileInclude
+overcloud_source_deps = deprecated/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-,,$@)
+
+# You can define in CONTROLEXTRA one or more additional YAML files to further extend the template, some additions could be:
+# - overcloud-vlan-port.yaml to activate the VLAN auto-assignment from Neutron
+# - nfs-source.yaml to configure Cinder with NFS
+overcloud.yaml: deprecated/overcloud-source.yaml deprecated/block-storage.yaml deprecated/swift-deploy.yaml deprecated/swift-source.yaml deprecated/swift-storage-source.yaml deprecated/ssl-source.yaml deprecated/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'} --scale CephStorage=$${CEPHSTORAGESCALE:-'0'} deprecated/overcloud-source.yaml deprecated/block-storage.yaml deprecated/swift-source.yaml deprecated/swift-storage-source.yaml deprecated/ssl-source.yaml deprecated/swift-deploy.yaml deprecated/nova-compute-config.yaml ${CONTROLEXTRA} > $@.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 $@
+
+undercloud-vm-ironic-vlan.yaml: undercloud-source.yaml undercloud-vm-ironic-config.yaml undercloud-vm-ironic-deploy.yaml undercloud-vlan-port.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