diff options
| author | Clay Gerrard <clay.gerrard@gmail.com> | 2012-09-10 19:05:10 -0500 |
|---|---|---|
| committer | Clay Gerrard <clay.gerrard@gmail.com> | 2012-09-10 19:52:09 -0500 |
| commit | 0fa231f718662f2b83c11ffc39f977fdc8941107 (patch) | |
| tree | 86457c9a650d59785abbd95ddb7d7607c239022b /etc/nova | |
| parent | 608b75e1256441b552fb410c3659436ec6fd93a8 (diff) | |
| download | nova-0fa231f718662f2b83c11ffc39f977fdc8941107.tar.gz nova-0fa231f718662f2b83c11ffc39f977fdc8941107.tar.xz nova-0fa231f718662f2b83c11ffc39f977fdc8941107.zip | |
Add flag cinder_endpoint_template to volume.cinder
Add optional flag to allow cinder endpoint to be defined by flag rather
than extracted from the request context's service catalog. No change to
default behavior.
This flag allows deployers to use a seperate management endpoint for
cinder which compute can use exclusively to send messages to cinder, or
just use an auth system that doesn't add/forward the catalog along with
the request (e.g. noauth).
Add python-cinderclient to tools/test-requires
fix lp bug #1048798
Change-Id: Icb416bf4df2a6e37024f1fbc866006d46d30bcf2
Diffstat (limited to 'etc/nova')
| -rw-r--r-- | etc/nova/nova.conf.sample | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index d3ef41bb2..15fcd9c28 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -1752,6 +1752,18 @@ #### resides +######## defined in nova.volume.cinder ######## + +# cinder_catalog_info=volume:cinder:publicURL +#### (StrOpt) Info to match when looking for cinder in the service catalog. +#### Format is : separated values of the form: +#### <service_type>:<service_name>:<endpoint_type> + +# cinder_endpoint_template=None +#### (StrOpt) Override service catalog lookup with template for cinder +#### endpoint e.g. http://localhost:8776/v1/%(project_id)s + + ######## defined in nova.volume.driver ######## # volume_group=nova-volumes |