x/python-ganttclient
Code Issues Proposed changes

fix for rc generation using noauth.

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-08-23 12:21:52 -07:00
parent b54beb547a
commit ddba1c0be5
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nova/auth/manager.py
View File

@@ -41,10 +41,13 @@ from nova.auth import signer
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
flags.DEFINE_bool('use_deprecated_auth',
False,
'This flag must be set to use old style auth')
flags.DEFINE_list('allowed_roles', flags.DEFINE_list('allowed_roles',
['cloudadmin', 'itsec', 'sysadmin', 'netadmin', 'developer'], ['cloudadmin', 'itsec', 'sysadmin', 'netadmin', 'developer'],
'Allowed roles for project') 'Allowed roles for project')
# NOTE(vish): a user with one of these roles will be a superuser and # NOTE(vish): a user with one of these roles will be a superuser and
# have access to all api commands # have access to all api commands
flags.DEFINE_list('superuser_roles', ['cloudadmin'], flags.DEFINE_list('superuser_roles', ['cloudadmin'],
@@ -814,7 +817,13 @@ class AuthManager(object):
s3_host = host s3_host = host
ec2_host = host ec2_host = host
rc = open(FLAGS.credentials_template).read() rc = open(FLAGS.credentials_template).read()
rc = rc % {'access': user.access, # NOTE(vish): Deprecated auth uses an access key, no auth uses a
# the user_id in place of it.
if FLAGS.use_deprecated_auth:
access = user.access
else:
access = user.id
rc = rc % {'access': access,
'project': pid, 'project': pid,
'secret': user.secret, 'secret': user.secret,
'ec2': '%s://%s:%s%s' % (FLAGS.ec2_scheme, 'ec2': '%s://%s:%s%s' % (FLAGS.ec2_scheme,