X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=349a07787aa2dcbb384f20f7904717c551a9d64c;hb=d6e40a3fffb37d476990cf4de4413057b5a9ef90;hp=2c9c2c0e624512e52e13a2209ca27791a10f9aeb;hpb=9ffb18af9421070fffb9375f1fc5e4c94ede0fde;p=apex-tripleo-heat-templates.git

diff --git a/Makefile b/Makefile
index 2c9c2c0e..349a0778 100644
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,54 @@
-generated_templates =                \
-        overcloud.yaml               \
-        undercloud-vm.yaml           \
-        undercloud-bm.yaml           \
-        undercloud-vm-tuskar.yaml    \
-        undercloud-vm-ironic.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
 
 # Files included in overcloud-source.yaml via FileInclude
 overcloud_source_deps = nova-compute-instance.yaml
 
 all: $(generated_templates)
-
-# Note that COMPUTESCALE is not a physical dep - 'make overcloud.yaml' won't do
-# the right thing if you change COMPUTESCALE from one run to another.
-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
+VALIDATE := $(patsubst %,validate-%,$(generated_templates))
+validate-all: $(VALIDATE)
+$(VALIDATE):
+	heat template-validate -f $(subst validate-,,$@)
+
+# set CONTROLEXTRA to overcloud-vlan-port.yaml to activate the VLAN
+# auto-assignment from Neutron.
+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 ${CONTROLEXTRA} > $@.tmp
 	mv $@.tmp $@
 
-overcloud-with-block-storage.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml block-storage.yaml
+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 overcloud-source.yaml swift-source.yaml block-storage.yaml > $@.tmp
+	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-source.yaml
-	python ./tripleo_heat_merge/merge.py $^ > $@.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-source.yaml
-	python ./tripleo_heat_merge/merge.py $^ > $@.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-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tuskar-source.yaml
-	python ./tripleo_heat_merge/merge.py $^ > $@.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.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml ironic-source.yaml
-	python ./tripleo_heat_merge/merge.py $^ > $@.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