diff options
| author | Monsyne Dragon <mdragon@rackspace.com> | 2011-01-05 19:04:23 -0600 |
|---|---|---|
| committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-01-05 19:04:23 -0600 |
| commit | 6549efce27997488bbcef8261b425bd9112309c4 (patch) | |
| tree | c5d1da91e9d487385b605d93d07e6677e9a03c23 /nova/adminclient.py | |
| parent | 8e18c84b03c442bd5272000712a55a6b60d037ed (diff) | |
| parent | 2a7fb3c86cd5c42762e5aae946d8e8e5566e41b9 (diff) | |
another merge from trunk to the latest rev.
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) |