diff options
| author | Nachi Ueno <nati.ueno@gmail.com> | 2011-01-12 17:47:54 +0900 |
|---|---|---|
| committer | Nachi Ueno <nati.ueno@gmail.com> | 2011-01-12 17:47:54 +0900 |
| commit | 6a4b4f0767f8518e57384ff88efafaa853d642a4 (patch) | |
| tree | 3a734da93c2161533dae571f862001cfc626cba9 /nova/adminclient.py | |
| parent | 7a6b7c32ed25d1edc58b924ce5621dc0d8de9686 (diff) | |
| parent | 78882d496b94915b8a6e2f2edce13e8129299982 (diff) | |
Merged with r548
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) |