diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-13 01:57:53 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-13 01:57:53 -0800 |
| commit | 0e307db62b9e8b0dcc38518822ab69f6bb12f052 (patch) | |
| tree | f4a66a2467e593e1ec7698b4f1069ea26b995e5f /nova/adminclient.py | |
| parent | a6b82b3015a64922a0733bd0dd5463b1a49ca080 (diff) | |
| parent | 621cf8e156582b3ff4dd44409324cc3a5f9aecf4 (diff) | |
| download | nova-0e307db62b9e8b0dcc38518822ab69f6bb12f052.tar.gz nova-0e307db62b9e8b0dcc38518822ab69f6bb12f052.tar.xz nova-0e307db62b9e8b0dcc38518822ab69f6bb12f052.zip | |
merged 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) |