trunk merge
This commit is contained in:
parent
dbef80d2fb
commit
c794bdfafe
|
@ -47,7 +47,7 @@ copyright = u'Rackspace, based on work by Jacob Kaplan-Moss'
|
|||
# The short X.Y version.
|
||||
version = '2.5'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '2.5.1'
|
||||
release = '2.5.2'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
|
|
@ -2,6 +2,14 @@
|
|||
Release notes
|
||||
=============
|
||||
|
||||
2.5.2 (June 15, 2011)
|
||||
=====================
|
||||
* ProjectID can be None for backwards compatability.
|
||||
|
||||
2.5.1 (June 10, 2011)
|
||||
=====================
|
||||
* ProjectID now part of authentication
|
||||
|
||||
2.5.0 (June 3, 2011)
|
||||
=================
|
||||
|
||||
|
|
|
@ -91,6 +91,7 @@ class OpenStackClient(httplib2.Http):
|
|||
# re-authenticate and try again. If it still fails, bail.
|
||||
try:
|
||||
kwargs.setdefault('headers', {})['X-Auth-Token'] = self.auth_token
|
||||
if self.projectid:
|
||||
kwargs['headers']['X-Auth-Project-Id'] = self.projectid
|
||||
|
||||
resp, body = self.request(self.management_url + url, method,
|
||||
|
@ -119,7 +120,10 @@ class OpenStackClient(httplib2.Http):
|
|||
return self._cs_request(url, 'DELETE', **kwargs)
|
||||
|
||||
def authenticate(self):
|
||||
headers = {'X-Auth-User': self.user, 'X-Auth-Key': self.apikey, 'X-Auth-Project-Id': self. projectid}
|
||||
headers = {'X-Auth-User': self.user,
|
||||
'X-Auth-Key': self.apikey}
|
||||
if self.projectid:
|
||||
headers['X-Auth-Project-Id'] = self.projectid
|
||||
resp, body = self.request(self.auth_url, 'GET', headers=headers)
|
||||
self.management_url = resp['x-server-management-url']
|
||||
self.auth_token = resp['x-auth-token']
|
||||
|
|
|
@ -150,8 +150,10 @@ class OpenStackShell(object):
|
|||
httplib2.debuglevel = 1
|
||||
|
||||
user, apikey, projectid, url = args.username, args.apikey, args.projectid, args.url
|
||||
|
||||
#FIXME(usrleon): Here should be restrict for project id same as for username or apikey
|
||||
# but for compatibility it is not.
|
||||
|
||||
if not user:
|
||||
raise CommandError("You must provide a username, either via "
|
||||
"--username or via env[NOVA_USERNAME]")
|
||||
|
|
Loading…
Reference in New Issue