summaryrefslogtreecommitdiffstats
path: root/cinder-storage.yaml
AgeCommit message (Collapse)AuthorFilesLines
2014-12-09Merge "Remove default flavor from every template"Jenkins1-1/+2
2014-12-05Align the cinder-storage.yaml template with block-storage.yamlGiulio Fidente1-54/+6
Change-Id: I00af10e07feed6c9c97ee6cad545dbff88cd6afc
2014-11-27Remove default flavor from every templateSteve Kowalik1-1/+2
With the push to using the new setup-flavors provided by os-cloud-config, the default flavor will no longer be called 'baremetal', and Heat will always validate the default even if it is overridden. To that end, remove the default flavor from every flavor definition. Just to be certain, also add a custom_constraint to every flavor definition that was missing it. Change-Id: I24251e73be4e86738857f73b89499f592c4908de
2014-10-21Add converted version of block and object storagePeter Belanyi1-0/+195
This patch extends the previous 'Don't use merge.py for overcloud' commit with the cinder-storage.yaml and swift-storage.yaml templates. Requirements for this to deploy: 1. Block and object storage images have to be built (overcloud-cinder-volume and overcloud-swift-storage) 2. The images have to be loaded by devtest_overcloud.sh OVERCLOUD_CINDER_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-cinder-volume.qcow2) OVERCLOUD_SWIFT_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-swift-storage.qcow2) Change-Id: I45f9d9f051970a83e26c0fd924d7c98276958113