diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-11-23 23:58:26 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-11-23 23:58:26 +0000 |
| commit | f67a2bfd59af8af0f3e688007078f32901c3eb97 (patch) | |
| tree | 584edb5eeeea59017f60b6ae20639da1d0a6ec2e /nova/adminclient.py | |
| parent | 521dd52e49feeae04108f3e21480f42456b4e4c7 (diff) | |
| parent | 645df81dd0bf03b8d014a437b60726de222c66c8 (diff) | |
| download | nova-f67a2bfd59af8af0f3e688007078f32901c3eb97.tar.gz nova-f67a2bfd59af8af0f3e688007078f32901c3eb97.tar.xz nova-f67a2bfd59af8af0f3e688007078f32901c3eb97.zip | |
merged trunk, added recent nova.sh
Diffstat (limited to 'nova/adminclient.py')
| -rw-r--r-- | nova/adminclient.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/nova/adminclient.py b/nova/adminclient.py index af55197fc..5a62cce7d 100644 --- a/nova/adminclient.py +++ b/nova/adminclient.py @@ -22,13 +22,15 @@ Nova User API client library. 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' -DEFAULT_ACCESS_KEY = 'admin' -DEFAULT_SECRET_KEY = 'admin' class UserInfo(object): @@ -192,9 +194,13 @@ class HostInfo(object): class NovaAdminClient(object): - def __init__(self, clc_url=DEFAULT_CLC_URL, region=DEFAULT_REGION, - access_key=DEFAULT_ACCESS_KEY, secret_key=DEFAULT_SECRET_KEY, - **kwargs): + def __init__( + self, + clc_url=DEFAULT_CLC_URL, + region=DEFAULT_REGION, + access_key=FLAGS.aws_access_key_id, + secret_key=FLAGS.aws_secret_access_key, + **kwargs): parts = self.split_clc_url(clc_url) self.clc_url = clc_url |