![Ryan Brady](/assets/img/avatar_default.png)
This patch removes the seperate overcloud-with-block-storage.yaml make target and merges the functionality into the main overcloud.yaml target. The default BLOCKSTORAGESCALE is 0. Change this number to add additional block storage nodes. This patch also updates the overcloud-with-block-storage-nfs target to more closely resemble the overcloud.yaml target, including swift and ssl templates as needed. The default BLOCKSTORAGESCALE is 1. Change this number to add additional block storage nodes. Change-Id: Ifcc733cfbf9f356393c3f6c72b2bbbb0214d3040
49 lines
2.2 KiB
Makefile
49 lines
2.2 KiB
Makefile
generated_templates = \
|
|
overcloud.yaml \
|
|
overcloud-with-block-storage-nfs.yaml \
|
|
undercloud-vm.yaml \
|
|
undercloud-bm.yaml \
|
|
undercloud-vm-tuskar.yaml \
|
|
undercloud-vm-ironic.yaml
|
|
|
|
# Files included in overcloud-source.yaml via FileInclude
|
|
overcloud_source_deps = nova-compute-instance.yaml
|
|
|
|
all: $(generated_templates)
|
|
|
|
overcloud.yaml: overcloud-source.yaml block-storage.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml $(overcloud_source_deps)
|
|
python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'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 > $@.tmp
|
|
mv $@.tmp $@
|
|
|
|
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 --scale NovaCompute=$${COMPUTESCALE:-'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
|
|
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 $@
|
|
|
|
check: test
|
|
|
|
test:
|
|
@bash test_merge.bash
|
|
|
|
clean:
|
|
rm -f $(generated_templates)
|
|
|
|
.PHONY: clean overcloud.yaml check
|