diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-01-06 23:46:36 -0600 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-01-06 23:46:36 -0600 |
| commit | ecb6363533251cb7f1c22e87e36db8fcf6d64eb1 (patch) | |
| tree | cc5cc1fc721fa1eab638861c8b6c37883ec38e4d /nova/adminclient.py | |
| parent | 8de96296dfb22d0e6c491fcaf072210dfbaa67e8 (diff) | |
| parent | e33102d23ec8f357c08e2583f8d9e3c1753bab4d (diff) | |
Merging trunk
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) |