x/gantt
Code Issues Proposed changes

boto shouldn't be required for production deploys

Browse Source 
... if you're not using ec2/s3.

Fixes bug 949631

bin/nova-manage imports auth.manager which imports auth.signer which
tries to import boto...  but nova-manage doesn't try to authenticate.

This patch allows bin/nova-manage to work if you don't have boto
installed.

Change-Id: I9b7929a15b991498ab0491821521ec20ed0da65c
This commit is contained in:
Chris Behrens
2012-03-07 22:43:12 -08:00
parent 6748d668c7
commit 985eae66ce
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/auth/signer.py
View File

@@ -48,12 +48,15 @@ import hashlib
import hmac import hmac
import urllib import urllib
try:
# NOTE(vish): for new boto # NOTE(vish): for new boto
import boto import boto
# for boto.utils # for boto.utils
import boto.provider import boto.provider
# NOTE(vish): for old boto # NOTE(vish): for old boto
import boto.utils import boto.utils
except ImportError:
boto = None
from nova import exception from nova import exception
from nova import log as logging from nova import log as logging
@@ -74,6 +77,8 @@ class Signer(object):
def s3_authorization(self, headers, verb, path): def s3_authorization(self, headers, verb, path):
"""Generate S3 authorization string.""" """Generate S3 authorization string."""
if not boto:
raise exception.Error('boto is not installed')
c_string = boto.utils.canonical_string(verb, path, headers) c_string = boto.utils.canonical_string(verb, path, headers)
hmac_copy = self.hmac.copy() hmac_copy = self.hmac.copy()
hmac_copy.update(c_string) hmac_copy.update(c_string)