diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2012-01-09 14:02:02 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2012-01-13 09:06:55 -0800 |
| commit | 60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf (patch) | |
| tree | f3764b8c1f7d4247ad9bf653643e60e1b68fffb7 /nova/auth | |
| parent | 26de3426d471c447cef1bd8a1129027821136241 (diff) | |
| download | nova-60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf.tar.gz nova-60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf.tar.xz nova-60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf.zip | |
Implements blueprint separate-nova-volumeapi
* Moves openstack/v2 directory to compute and fixes tests accordingly
* Moves some code from api/openstack/compute to shared location, for use by volume api
* Implements basic volume functionality for types, volumes, and snapshots
* Changes service name from osapi to osapi_compute (and adds osapi_volume)
* Renames nova-api-os to nova-api-os-compute, adds nove-api-os-volume
* Separate extension mechanism for compute and volume
** Removes flag osapi_extension and replaces with osapi_compute_extension and osapi_volume_extension
* Updates the paste config
* Fixes setup.py to include nova-os-api-compute and nova-os-api-volume
* Fix bug in volume version code that occurred as result of trunk merge
* Update integrated/test_volumes.py to use new endpoint
Change-Id: I4c2e57c3cafd4e1a9e2ff3ce201c8cf28326afcd
Diffstat (limited to 'nova/auth')
| -rw-r--r-- | nova/auth/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/auth/manager.py b/nova/auth/manager.py index 3d984f1bf..f6c88e082 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -827,7 +827,7 @@ class AuthManager(object): 's3': 'http://%s:%s' % (s3_host, FLAGS.s3_port), 'os': '%s://%s:%s%s' % (FLAGS.osapi_scheme, ec2_host, - FLAGS.osapi_port, + FLAGS.osapi_compute_listen_port, FLAGS.osapi_path), 'user': user.name, 'nova': FLAGS.ca_file, |