diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-08 14:52:05 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-08 14:52:05 -0500 |
| commit | 71ad924b1e8bfdefaaac3dd533dc14d83b2ab7bd (patch) | |
| tree | 63ad91243be62f39a26a32562ab49f137a87855e /nova/auth | |
| parent | d7925b3890f651b3f6fd002a45b2add86e388d10 (diff) | |
| parent | 50c9ebfdc00a87d1a37a11501e5678de89e25a4f (diff) | |
| download | nova-71ad924b1e8bfdefaaac3dd533dc14d83b2ab7bd.tar.gz nova-71ad924b1e8bfdefaaac3dd533dc14d83b2ab7bd.tar.xz nova-71ad924b1e8bfdefaaac3dd533dc14d83b2ab7bd.zip | |
merged trunk again
Diffstat (limited to 'nova/auth')
| -rw-r--r-- | nova/auth/ldapdriver.py | 2 | ||||
| -rw-r--r-- | nova/auth/novarc.template | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/auth/ldapdriver.py b/nova/auth/ldapdriver.py index 183f7a985..e9532473d 100644 --- a/nova/auth/ldapdriver.py +++ b/nova/auth/ldapdriver.py @@ -139,7 +139,7 @@ class LdapDriver(object): self.__cache = None return False - def __local_cache(key_fmt): + def __local_cache(key_fmt): # pylint: disable=E0213 """Wrap function to cache it's result in self.__cache. Works only with functions with one fixed argument. """ diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template index eba3a8537..d05c099d7 100644 --- a/nova/auth/novarc.template +++ b/nova/auth/novarc.template @@ -14,4 +14,5 @@ alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_P alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}" export NOVA_API_KEY="%(access)s" export NOVA_USERNAME="%(user)s" +export NOVA_PROJECT_ID="%(project)s" export NOVA_URL="%(os)s" |