diff options
| author | Anne Gentle <anne@openstack.org> | 2011-01-07 10:57:53 -0600 |
|---|---|---|
| committer | Anne Gentle <anne@openstack.org> | 2011-01-07 10:57:53 -0600 |
| commit | 5d02ee9e5f1502de2d379ce1acbc7e6bae1732f1 (patch) | |
| tree | e75bc3a452904d8e28db0d2a69b44d726835b0f0 /nova/adminclient.py | |
| parent | 80d10d960d0d472bf9a1d35bce081fb350c98a35 (diff) | |
| parent | e33102d23ec8f357c08e2583f8d9e3c1753bab4d (diff) | |
Merged with 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) |