diff options
| author | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-01-14 04:39:35 +0900 |
|---|---|---|
| committer | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-01-14 04:39:35 +0900 |
| commit | 6bfcd0e63f247553207dcbfe2a3ad0d1403eec5a (patch) | |
| tree | 936e1a9c175fba12c445f4ac17897793af3efb80 /nova/adminclient.py | |
| parent | ea28b3117b02bcfd26e4017e850313cf5272d354 (diff) | |
| parent | d7373358443bb64f72b65ee18e35b8d90518f011 (diff) | |
Fixed based on the comments from code review. Merged to trunk rev 561
Diffstat (limited to 'nova/adminclient.py')
| -rw-r--r-- | nova/adminclient.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nova/adminclient.py b/nova/adminclient.py index 6ae9f0c0f..b2609c8c4 100644 --- a/nova/adminclient.py +++ b/nova/adminclient.py @@ -23,12 +23,9 @@ import base64 import boto import httplib -from nova import flags from boto.ec2.regioninfo import RegionInfo -FLAGS = flags.FLAGS - DEFAULT_CLC_URL = 'http://127.0.0.1:8773' DEFAULT_REGION = 'nova' @@ -199,8 +196,8 @@ class NovaAdminClient(object): self, clc_url=DEFAULT_CLC_URL, region=DEFAULT_REGION, - access_key=FLAGS.aws_access_key_id, - secret_key=FLAGS.aws_secret_access_key, + access_key=None, + secret_key=None, **kwargs): parts = self.split_clc_url(clc_url) |