Permit writing output to other than stdout.

[apex-tripleo-heat-templates.git] / Makefile

diff --git a/Makefile b/Makefile
index 3f38859..d7fc543 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,43 @@
-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.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 $^ > $@.tmp
+all: $(generated_templates)
+
+overcloud.yaml: overcloud-source.yaml swift-source.yaml ssl-source.yaml $(overcloud_source_deps)
+       python ./tripleo_heat_merge/merge.py 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 $@
+
+test:
+       @bash test_merge.bash
+
+clean:
+       rm -f $(generated_templates)