summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Carlen <devin.carlen@gmail.com>2010-12-30 17:50:32 -0800
committerDevin Carlen <devin.carlen@gmail.com>2010-12-30 17:50:32 -0800
commita89730699db2add131028ccda031ead3526b2c4f (patch)
tree4294c61e9e47b7a180a6fc823a58d9e45e96851d
parent4039bec5aa7e9e73304ab342c9a38f824ac78c98 (diff)
downloadnova-a89730699db2add131028ccda031ead3526b2c4f.tar.gz
nova-a89730699db2add131028ccda031ead3526b2c4f.tar.xz
nova-a89730699db2add131028ccda031ead3526b2c4f.zip
Removed dependencies on flags.py from adminclient
-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)