ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-01 13:59:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refine role modules (#55021)

Browse source
This commit is contained in:
Yunge Zhu 2019-04-09 16:05:03 +08:00 • committed by GitHub
parent 09f68fc659
commit cb2972d647
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 74 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/cloud/azure/azure_rm_roledefinition_facts.py
View file

@ -234,7 +234,7 @@ class AzureRMRoleDefinitionFacts(AzureRMModuleBase):
except CloudError as ex:
self.log("Didn't find role definition in scope {0}".format(self.scope))
return []
return response
def get_by_id(self):
'''
@ -252,9 +252,9 @@ class AzureRMRoleDefinitionFacts(AzureRMModuleBase):
response = roledefinition_to_dict(response)
if self.type:
if response.role_type == self.type:
return response
return [response]
else:
return response
return [response]
except CloudError as ex:
self.log("Didn't find role definition by id {0}".format(self.id))
@ -269,7 +269,7 @@ class AzureRMRoleDefinitionFacts(AzureRMModuleBase):
'''
self.log("Get Role Definition by name {0}".format(self.role_name))
response = None
response = []
try:
response = self.list()
@ -282,7 +282,7 @@ class AzureRMRoleDefinitionFacts(AzureRMModuleBase):
if len(roles) == 1:
self.log("Role Definition : {0} found".format(self.role_name))
return roles[0]
return roles
if len(roles) > 1:
self.fail("Found multiple Role Definitions with name: {0}".format(self.role_name))