← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/compute/monitor.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/compute/monitor.py
46
46
                     'Sleep time between updates')
47
47
flags.DEFINE_integer('monitoring_instances_step', 300,
48
48
                     'Interval of RRD updates')
49
 
flags.DEFINE_string('monitoring_rrd_path', '/var/nova/monitor/instances',
 
49
flags.DEFINE_string('monitoring_rrd_path', '$state_path/monitor/instances',
50
50
                    'Location of RRD files')
51
51
 
52
52
 
211
211
    #       the response we can make our own client that does the actual
212
212
    #       request and hands it off to the response parser.
213
213
    s3 = boto.s3.connection.S3Connection(
214
 
        aws_access_key_id='admin',
215
 
        aws_secret_access_key='admin',
 
214
        aws_access_key_id=FLAGS.aws_access_key_id,
 
215
        aws_secret_access_key=FLAGS.aws_secret_access_key,
216
216
        is_secure=False,
217
217
        calling_format=boto.s3.connection.OrdinaryCallingFormat(),
218
218
        port=FLAGS.s3_port,