diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-10 13:06:36 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-10 13:06:36 -0800 |
| commit | 220259d6ca9131c738a2d4ea9cd28ca64edbcfeb (patch) | |
| tree | 27266ddb476586ed2bb87bd53d4fef9c974da8a8 /nova/adminclient.py | |
| parent | 9b99e385967c4ba21d94d82aa62115fc11634118 (diff) | |
| parent | 16c420ee156f8c7716c7e84b66af35cbccf5090c (diff) | |
| download | nova-220259d6ca9131c738a2d4ea9cd28ca64edbcfeb.tar.gz nova-220259d6ca9131c738a2d4ea9cd28ca64edbcfeb.tar.xz nova-220259d6ca9131c738a2d4ea9cd28ca64edbcfeb.zip | |
merge trunk
Diffstat (limited to 'nova/adminclient.py')
| -rw-r--r-- | nova/adminclient.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/adminclient.py b/nova/adminclient.py index eabfce804..b2609c8c4 100644 --- a/nova/adminclient.py +++ b/nova/adminclient.py @@ -23,10 +23,8 @@ 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' @@ -198,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) |