openstack/heat
Code Issues Proposed changes

Merge "Allows update of domain for keystone project and group"

Browse Source
This commit is contained in:
Jenkins
2015-03-17 03:14:20 +00:00
committed by Gerrit Code Review
parent 6b982d11dd 556a596ad0
commit c4efe83302
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/heat_keystone/heat_keystone/resources/group.py
View File

@@ -57,6 +57,7 @@ class KeystoneGroup(role_assignments.KeystoneRoleAssignment):
roles:
- role: {get_param: group_role}
domain: {get_param: group_role_domain}
- role: {get_param: group_role}
project: {get_param: group_role_project}
'''
@@ -121,9 +122,6 @@ class KeystoneGroup(role_assignments.KeystoneRoleAssignment):
if new_description is not None:
values['description'] = new_description
if len(values) == 0:
return
values['group'] = group_id
domain = (self.client_plugin('keystone').
get_domain_id(domain))

3
contrib/heat_keystone/heat_keystone/resources/project.py
View File

@@ -120,9 +120,6 @@ class KeystoneProject(resource.Resource):
if enabled is not None:
values['enabled'] = enabled
if len(values) == 0:
return
values['project'] = project_id
domain = (self.client_plugin('keystone').
get_domain_id(domain))