catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup multi-region support for ELB, SQS, Cloudformation, EC2, Autoscaling.

Browse source
This commit is contained in:
Steve Pulec 2014-11-15 13:34:52 -05:00
commit bd847bd941
16 changed files with 184 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

4
moto/iam/models.py
View file

@ -16,7 +16,7 @@ class Role(object):
self.policies = policies
@classmethod
def create_from_cloudformation_json(cls, resource_name, cloudformation_json):
def create_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name):
properties = cloudformation_json['Properties']
return iam_backend.create_role(
@ -45,7 +45,7 @@ class InstanceProfile(object):
self.roles = roles if roles else []
@classmethod
def create_from_cloudformation_json(cls, resource_name, cloudformation_json):
def create_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name):
properties = cloudformation_json['Properties']
role_ids = properties['Roles']