summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-11-25 11:17:14 -0500
committerDan Prince <dprince@redhat.com>2015-11-25 15:00:13 -0500
commitfba215a69da02a97f5132671c43a2cc6a5a2c2d1 (patch)
tree803b080b24dcda5d9d73912866f7c3b67b6031b8 /Makefile
parent80d929c75f979d99d4e608aae790f38786b4e055 (diff)
Drop deprecated templates/Makefile/merge.py
This patch drops a bunch of deprecated stuff from tripleo-heat-templates. Once we remove the Makefile (which creates overcloud.yaml) we can proceed in renaming overcloud-without-mergepy.yaml to overcloud.yaml. Change-Id: Ic6ab3777d19e207cae29dcbc2e3839815cd80181
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile49
1 files changed, 0 insertions, 49 deletions
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 131e1b9e..00000000
--- a/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-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 deprecated/overcloud-source.yaml via FileInclude
-overcloud_source_deps = deprecated/nova-compute-instance.yaml
-
-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: deprecated/undercloud-source.yaml deprecated/undercloud-vm-nova-config.yaml deprecated/undercloud-vm-nova-deploy.yaml
- python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
- mv $@.tmp $@
-
-undercloud-bm.yaml: deprecated/undercloud-source.yaml deprecated/undercloud-bm-nova-config.yaml deprecated/undercloud-bm-nova-deploy.yaml
- python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
- mv $@.tmp $@
-
-undercloud-vm-ironic.yaml: deprecated/undercloud-source.yaml deprecated/undercloud-vm-ironic-config.yaml deprecated/undercloud-vm-ironic-deploy.yaml
- python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
- mv $@.tmp $@
-
-undercloud-vm-ironic-vlan.yaml: deprecated/undercloud-source.yaml deprecated/undercloud-vm-ironic-config.yaml deprecated/undercloud-vm-ironic-deploy.yaml deprecated/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