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

Update ManageIQ Azure Tenant ID parameter (#34806)

Browse source 
Currently the ManageIQ API does not support azure_tenant_id but
this is in the process of being fixed. This commit changes
the recently-committed parameter to allow for the upcoming change.
This commit is contained in:
Christopher Brown 2018-01-14 11:53:28 +00:00 committed by ansibot
parent 05c960cf92
commit 7644042d21
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/remote_management/manageiq/manageiq_provider.py
View file

@ -61,10 +61,7 @@ options:
default: null default: null
description: Microsoft Azure subscription ID. defaults to None. description: Microsoft Azure subscription ID. defaults to None.
version_added: "2.5" version_added: "2.5"
# There doesn't currently appear to be an entry point for azure_tenant_id and azure_tenant_id:
# tenant_id is already in use. Therefore we use uid_ems until this has been created.
# See discussion in https://gitter.im/ManageIQ/manageiq/providers
uid_ems:
required: false required: false
default: null default: null
description: Tenant ID. defaults to None. description: Tenant ID. defaults to None.
@ -421,7 +418,7 @@ EXAMPLES = '''
type: 'Azure' type: 'Azure'
provider_region: 'northeurope' provider_region: 'northeurope'
subscription: 'e272bd74-f661-484f-b223-88dd128a4049' subscription: 'e272bd74-f661-484f-b223-88dd128a4049'
uid_ems: 'e272bd74-f661-484f-b223-88dd128a4048' azure_tenant_id: 'e272bd74-f661-484f-b223-88dd128a4048'
state: 'present' state: 'present'
provider: provider:
hostname: 'azure.example.com' hostname: 'azure.example.com'
@ -704,7 +701,7 @@ def main():
host_default_vnc_port_start=dict(), host_default_vnc_port_start=dict(),
host_default_vnc_port_end=dict(), host_default_vnc_port_end=dict(),
subscription=dict(), subscription=dict(),
uid_ems=dict(), azure_tenant_id=dict(),
type=dict(choices=supported_providers().keys()), type=dict(choices=supported_providers().keys()),
) )
# add the manageiq connection arguments to the arguments # add the manageiq connection arguments to the arguments
@ -729,7 +726,7 @@ def main():
host_default_vnc_port_start = module.params['host_default_vnc_port_start'] host_default_vnc_port_start = module.params['host_default_vnc_port_start']
host_default_vnc_port_end = module.params['host_default_vnc_port_end'] host_default_vnc_port_end = module.params['host_default_vnc_port_end']
subscription = module.params['subscription'] subscription = module.params['subscription']
uid_ems = module.params['uid_ems'] uid_ems = module.params['azure_tenant_id']
state = module.params['state'] state = module.params['state']
manageiq = ManageIQ(module) manageiq = ManageIQ(module)