diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2010-11-23 12:04:34 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2010-11-23 12:04:34 -0600 |
| commit | 513e4eb76a8d21108484bbc08e3ff755190cb2d9 (patch) | |
| tree | d29375e89e11c408f185ea159a01976eecb7ba3c /nova/compute | |
| parent | a81547f780afec4eee88e87a301b32c903943c2c (diff) | |
Make aws_access_key_id and aws_secret_access_key configurable
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/monitor.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/monitor.py b/nova/compute/monitor.py index d0154600f..ce45b14f6 100644 --- a/nova/compute/monitor.py +++ b/nova/compute/monitor.py @@ -211,8 +211,8 @@ def store_graph(instance_id, filename): # the response we can make our own client that does the actual # request and hands it off to the response parser. s3 = boto.s3.connection.S3Connection( - aws_access_key_id='admin', - aws_secret_access_key='admin', + aws_access_key_id=FLAGS.aws_access_key_id, + aws_secret_access_key=FLAGS.aws_secret_access_key, is_secure=False, calling_format=boto.s3.connection.OrdinaryCallingFormat(), port=FLAGS.s3_port, |