summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Carlen <devin.carlen@gmail.com>2011-01-05 23:49:27 +0000
committerTarmac <>2011-01-05 23:49:27 +0000
commit2a7fb3c86cd5c42762e5aae946d8e8e5566e41b9 (patch)
treed3253676a768025355dea2abb6a222317e1a79e4
parent20e990de345d02b443d52d73bd1db8d58d738cc0 (diff)
parenta89730699db2add131028ccda031ead3526b2c4f (diff)
downloadnova-2a7fb3c86cd5c42762e5aae946d8e8e5566e41b9.tar.gz
nova-2a7fb3c86cd5c42762e5aae946d8e8e5566e41b9.tar.xz
nova-2a7fb3c86cd5c42762e5aae946d8e8e5566e41b9.zip
Removed dependencies on nova server components for the admin client.
-rw-r--r--nova/adminclient.py7
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)