c82b6cec10
This patch moves all the related mergepy templates for the overcloud into a deprecated directory. The Makefile has been updated so that overcloud.yaml is still generated at the top level so this shouldn't break end users. This is to reduce confusion for new users who are learning the TripleO heat templates and find the fact that we have two full implementations very confusing. Change-Id: I0848aca4dee3e37cb4c6089c5f655ad22ac6c5fd
50 lines
2.5 KiB
Makefile
50 lines
2.5 KiB
Makefile
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: 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
|