Merge "Merge Block Storage into Overcloud"
This commit is contained in:
commit
78eb968d15
15
Makefile
15
Makefile
@ -1,6 +1,5 @@
|
||||
generated_templates = \
|
||||
overcloud.yaml \
|
||||
overcloud-with-block-storage.yaml \
|
||||
overcloud-with-block-storage-nfs.yaml \
|
||||
undercloud-vm.yaml \
|
||||
undercloud-bm.yaml \
|
||||
@ -12,20 +11,14 @@ overcloud_source_deps = nova-compute-instance.yaml
|
||||
|
||||
all: $(generated_templates)
|
||||
|
||||
overcloud.yaml: overcloud-source.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'} overcloud-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml > $@.tmp
|
||||
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.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 --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale BlockStorage=$${CINDERSCALE:-'1'} overcloud-source.yaml swift-source.yaml block-storage.yaml > $@.tmp
|
||||
mv $@.tmp $@
|
||||
|
||||
overcloud-with-block-storage-nfs.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml nfs-server-source.yaml block-storage-nfs.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 --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale BlockStorage=$${CINDERSCALE:-'1'} overcloud-source.yaml swift-source.yaml nfs-server-source.yaml block-storage-nfs.yaml > $@.tmp
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user