diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-15 21:03:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-15 21:03:08 +0000 |
| commit | d78e642d8d7d93d425e76163f2889df9cb7d65dc (patch) | |
| tree | 276e2acf66cfc9fd08d64a792eb4d27a174e5705 | |
| parent | 9455ff896894cb48fd069ddb02f3f87a0d055914 (diff) | |
| parent | 4db98faa1c55c6f369ec84ed478338141ad5e7d8 (diff) | |
| download | nova-d78e642d8d7d93d425e76163f2889df9cb7d65dc.tar.gz nova-d78e642d8d7d93d425e76163f2889df9cb7d65dc.tar.xz nova-d78e642d8d7d93d425e76163f2889df9cb7d65dc.zip | |
Merge "Adds a flag to allow configuring a region"
| -rw-r--r-- | nova/volume/cinder.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py index 514295605..fccdedac8 100644 --- a/nova/volume/cinder.py +++ b/nova/volume/cinder.py @@ -42,6 +42,9 @@ cinder_opts = [ default=None, help='Override service catalog lookup with template for cinder ' 'endpoint e.g. http://localhost:8776/v1/%(project_id)s'), + cfg.StrOpt('os_region_name', + default=None, + help='region name of this node'), cfg.IntOpt('cinder_http_retries', default=3, help='Number of cinderclient retries on failed http calls'), @@ -66,7 +69,16 @@ def cinderclient(context): else: info = CONF.cinder_catalog_info service_type, service_name, endpoint_type = info.split(':') - url = sc.url_for(service_type=service_type, + # extract the region if set in configuration + if CONF.os_region_name: + attr = 'region' + filter_value = CONF.os_region_name + else: + attr = None + filter_value = None + url = sc.url_for(attr=attr, + filter_value=filter_value, + service_type=service_type, service_name=service_name, endpoint_type=endpoint_type) |