← Back to branch summary

~gandelman-a/pyjuju/bootstrap-fix

« back to all changes in this revision

Viewing changes to ensemble/providers/ec2/utils.py

  • Committer: Gustavo Niemeyer
  • Date: 2011-06-07 21:34:10 UTC
  • mfrom: (240.2.1 micro-is-slugish)
  • Revision ID: gustavo@niemeyer.net-20110607213410-fh2hf1klyxxo8ajp
Merged micro-is-sluggish branch [r=hazmat]

This changes the default instance type on EC2 to m1.small.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ensemble/providers/ec2/utils.py
150
150
        scripts=scripts,
151
151
        data=kw)
152
152
 
153
 
    instance_type = config.get("default-instance-type", "t1.micro")
 
153
    instance_type = config.get("default-instance-type", "m1.small")
154
154
    # XXX ideally should come from latest available or client release name,
155
155
    # for now to speed bootstrap, we use a prepopulated image by region.
156
156
    region = config.get("region", "us-east-1")