← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/adminclient.py

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-12-13 10:17:01 UTC
  • mto: This revision was merged to the branch mainline in revision 8.
  • Revision ID: james.westby@ubuntu.com-20101213101701-txhhqbzsxw4avnxv
Tags: upstream-2011.1~bzr456
Import upstream version 2011.1~bzr456

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/adminclient.py
22
22
import base64
23
23
import boto
24
24
import httplib
 
25
 
 
26
from nova import flags
25
27
from boto.ec2.regioninfo import RegionInfo
26
28
 
27
29
 
 
30
FLAGS = flags.FLAGS
 
31
 
28
32
DEFAULT_CLC_URL = 'http://127.0.0.1:8773'
29
33
DEFAULT_REGION = 'nova'
30
 
DEFAULT_ACCESS_KEY = 'admin'
31
 
DEFAULT_SECRET_KEY = 'admin'
32
34
 
33
35
 
34
36
class UserInfo(object):
192
194
 
193
195
 
194
196
class NovaAdminClient(object):
195
 
    def __init__(self, clc_url=DEFAULT_CLC_URL, region=DEFAULT_REGION,
196
 
                 access_key=DEFAULT_ACCESS_KEY, secret_key=DEFAULT_SECRET_KEY,
197
 
                 **kwargs):
 
197
    def __init__(
 
198
            self,
 
199
            clc_url=DEFAULT_CLC_URL,
 
200
            region=DEFAULT_REGION,
 
201
            access_key=FLAGS.aws_access_key_id,
 
202
            secret_key=FLAGS.aws_secret_access_key,
 
203
            **kwargs):
198
204
        parts = self.split_clc_url(clc_url)
199
205
 
200
206
        self.clc_url = clc_url