diff options
| author |   Peter Belanyi <pbelanyi@redhat.com> | 2014-09-24 07:51:13 -0400 |
|---|---|---|
| committer |   Tomas Sedovic <tsedovic@redhat.com> | 2014-10-21 13:39:09 +0200 |
| commit | 24f40d5312fd6e92356936e22a1a5b8f4b3e04d5 (patch) | |
| tree | 493ec4a33fb1bdd3d409b990e8b0855906046d41 /overcloud-resource-registry.yaml | |
| parent | bcdcc28cb6905be257b50a962822bdbecaef0b0e (diff) | |
Add converted version of block and object storage
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
Diffstat (limited to 'overcloud-resource-registry.yaml')
| -rw-r--r-- | overcloud-resource-registry.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml index 29074fcf..822d9873 100644 --- a/overcloud-resource-registry.yaml +++ b/overcloud-resource-registry.yaml @@ -1,3 +1,5 @@ resource_registry: + OS::TripleO::BlockStorage: cinder-storage.yaml OS::TripleO::Compute: compute.yaml OS::TripleO::Controller: controller.yaml + OS::TripleO::ObjectStorage: swift-storage.yaml |