← Back to branch summary

~andrewsmedina/pyjuju/ec2-ipv4

« back to all changes in this revision

Viewing changes to juju/providers/ec2/__init__.py

  • Committer: kapil.thangavelu at canonical
  • Date: 2012-04-09 18:05:14 UTC
  • Revision ID: kapil.thangavelu@canonical.com-20120409180514-i2jryrfce8yc8s0z
[trivial] fix for private clouds using ec2 api, ec2-zone and instance-type are still valid constraints

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/providers/ec2/__init__.py
50
50
    def get_constraint_set(self):
51
51
        """Return the set of constraints that are valid for this provider."""
52
52
        cs = yield super(MachineProvider, self).get_constraint_set()
53
 
        if self.using_amazon:
 
53
        if 1:  # These keys still need to be valid (instance-type and ec2-zone)
 
54
        #if self.using_amazon:
54
55
            # Expose EC2 instance types/zones on AWS itelf, not private clouds.
55
56
            cs.register_generics(INSTANCE_TYPES.keys())
56
57
            cs.register("ec2-zone", converter=convert_zone)