openstack
/
heat
Code Issues Proposed changes

Merge changes I31d97b0d,I10507113 

* changes:
  Changed SecurityGroups property type to TuplesList
  Change the policies for User to TuplesList
This commit is contained in:
Jenkins 2012-05-29 21:40:06 +00:00 committed by Gerrit Code Review
parent 29aea9c552 9098543338
commit 9ea875a250
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/instance.py
View File

@ -68,7 +68,7 @@ class Instance(Resource):
'Implemented': False},
'RamDiskId': {'Type': 'String',
'Implemented': False},
'SecurityGroups': {'Type': 'CommaDelimitedList',
'SecurityGroups': {'Type': 'TuplesList',
'Implemented': False},
'SecurityGroupIds': {'Type': 'CommaDelimitedList',
'Implemented': False},

2
heat/engine/user.py
View File

@ -30,7 +30,7 @@ class User(Resource):
'Implemented': False},
'LoginProfile': {'Type': 'String',
'Implemented': False},
'Policies': {'Type': 'CommaDelimitedList'}}
'Policies': {'Type': 'TuplesList'}}
def __init__(self, name, json_snippet, stack):
super(User, self).__init__(name, json_snippet, stack)