cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add adfs_authority_url arg in azure_rm.py (#41071)

Browse source
This commit is contained in:
Yunge Zhu 2018-06-04 12:57:02 +08:00 committed by Zim Kalinowski
parent 033adf8cd5
commit bd34194ace
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/inventory/azure_rm.py
View file

@ -326,10 +326,10 @@ class AzureRM(object):
# get authentication authority # get authentication authority
# for adfs, user could pass in authority or not. # for adfs, user could pass in authority or not.
# for others, use default authority from cloud environment # for others, use default authority from cloud environment
if self.credentials.get('adfs_authority_url') is None: if self.credentials.get('adfs_authority_url'):
self._adfs_authority_url = self._cloud_environment.endpoints.active_directory
else:
self._adfs_authority_url = self.credentials.get('adfs_authority_url') self._adfs_authority_url = self.credentials.get('adfs_authority_url')
else:
self._adfs_authority_url = self._cloud_environment.endpoints.active_directory
# get resource from cloud environment # get resource from cloud environment
self._resource = self._cloud_environment.endpoints.active_directory_resource_id self._resource = self._cloud_environment.endpoints.active_directory_resource_id
@ -627,6 +627,8 @@ class AzureInventory(object):
help='Active Directory User') help='Active Directory User')
parser.add_argument('--password', action='store', parser.add_argument('--password', action='store',
help='password') help='password')
parser.add_argument('--adfs_authority_url', action='store',
help='Azure ADFS authority url')
parser.add_argument('--cloud_environment', action='store', parser.add_argument('--cloud_environment', action='store',
help='Azure Cloud Environment name or metadata discovery URL') help='Azure Cloud Environment name or metadata discovery URL')
parser.add_argument('--resource-groups', action='store', parser.add_argument('--resource-groups', action='store',