summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-16 12:25:54 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-20 11:22:16 +0000
commit5d97f3408fb700d7987753e55ef5b187b84998de (patch)
tree52bfe68aa6b45d27cae6578fdacd1b337d90e9b3
parent878c6ff1e5f19136428271ff8e4ab854c4aa28e9 (diff)
downloaddefinitions-5d97f3408fb700d7987753e55ef5b187b84998de.tar.gz
Cinder fixups
-rw-r--r--openstack/usr/share/openstack/cinder.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/openstack/usr/share/openstack/cinder.yml b/openstack/usr/share/openstack/cinder.yml
index 35e7a4f8..f5f9ddc8 100644
--- a/openstack/usr/share/openstack/cinder.yml
+++ b/openstack/usr/share/openstack/cinder.yml
@@ -34,23 +34,23 @@
token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
- keystone_service: >
- name=cinderv1
+ name=cinder
type=volume
description="Openstack Block Storage"
publicurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s'
internalurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s'
adminurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s'
- region='RegionOne'
+ region='regionOne'
token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
- keystone_service: >
name=cinderv2
- type=volume
+ type=volumev2
description="Openstack Block Storage"
publicurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s'
internalurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s'
adminurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s'
- region='RegionOne'
+ region='regionOne'
token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
- postgresql_user: name={{ CINDER_DB_USER }}
@@ -72,4 +72,4 @@
- openstack-cinder-volume
- openstack-cinder-backup
- - lvg: vg=cinder-volumes pvs={{ CINDER_DEVICE }}
+ - lvg: vg=cinder-volumes pvs={{ CINDER_DEVICE }}