Removed dependencies on flags.py from adminclient
This commit is contained in:
@@ -23,12 +23,9 @@ import base64
|
|||||||
import boto
|
import boto
|
||||||
import httplib
|
import httplib
|
||||||
|
|
||||||
from nova import flags
|
|
||||||
from boto.ec2.regioninfo import RegionInfo
|
from boto.ec2.regioninfo import RegionInfo
|
||||||
|
|
||||||
|
|
||||||
FLAGS = flags.FLAGS
|
|
||||||
|
|
||||||
DEFAULT_CLC_URL = 'http://127.0.0.1:8773'
|
DEFAULT_CLC_URL = 'http://127.0.0.1:8773'
|
||||||
DEFAULT_REGION = 'nova'
|
DEFAULT_REGION = 'nova'
|
||||||
|
|
||||||
@@ -199,8 +196,8 @@ class NovaAdminClient(object):
|
|||||||
self,
|
self,
|
||||||
clc_url=DEFAULT_CLC_URL,
|
clc_url=DEFAULT_CLC_URL,
|
||||||
region=DEFAULT_REGION,
|
region=DEFAULT_REGION,
|
||||||
access_key=FLAGS.aws_access_key_id,
|
access_key=None,
|
||||||
secret_key=FLAGS.aws_secret_access_key,
|
secret_key=None,
|
||||||
**kwargs):
|
**kwargs):
|
||||||
parts = self.split_clc_url(clc_url)
|
parts = self.split_clc_url(clc_url)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user