ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

VMware: Allow users to specify port for ESXi (#34073)

Browse source 
This fix adds 'port' as module parameter in VMware modules,
which allows user to specify vCenter or ESXi server port number for
admin connection.

Fixes: #34070

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2017-12-20 11:53:22 +05:30 • committed by GitHub
parent be89822bb5
commit f7fe6a065e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/module_utils/vmware.py
View file

@ -437,6 +437,7 @@ def vmware_argument_spec():
hostname=dict(type='str', required=True), hostname=dict(type='str', required=True),
username=dict(type='str', aliases=['user', 'admin'], required=True), username=dict(type='str', aliases=['user', 'admin'], required=True),
password=dict(type='str', aliases=['pass', 'pwd'], required=True, no_log=True), password=dict(type='str', aliases=['pass', 'pwd'], required=True, no_log=True),
port=dict(type='int', default=443),
validate_certs=dict(type='bool', required=False, default=True), validate_certs=dict(type='bool', required=False, default=True),
) )
@ -445,6 +446,7 @@ def connect_to_api(module, disconnect_atexit=True):
hostname = module.params['hostname'] hostname = module.params['hostname']
username = module.params['username'] username = module.params['username']
password = module.params['password'] password = module.params['password']
port = module.params['port'] or 443
validate_certs = module.params['validate_certs'] validate_certs = module.params['validate_certs']
if validate_certs and not hasattr(ssl, 'SSLContext'): if validate_certs and not hasattr(ssl, 'SSLContext'):
@ -458,23 +460,23 @@ def connect_to_api(module, disconnect_atexit=True):
service_instance = None service_instance = None
try: try:
service_instance = connect.SmartConnect(host=hostname, user=username, pwd=password, sslContext=ssl_context) service_instance = connect.SmartConnect(host=hostname, user=username, pwd=password, sslContext=ssl_context, port=port)
except vim.fault.InvalidLogin as e: except vim.fault.InvalidLogin as e:
module.fail_json(msg="Unable to log on to vCenter or ESXi API at %s as %s: %s" % (hostname, username, e.msg)) module.fail_json(msg="Unable to log on to vCenter or ESXi API at %s:%s as %s: %s" % (hostname, port, username, e.msg))
except vim.fault.NoPermission as e: except vim.fault.NoPermission as e:
module.fail_json(msg="User %s does not have required permission" module.fail_json(msg="User %s does not have required permission"
" to log on to vCenter or ESXi API at %s: %s" % (username, hostname, e.msg)) " to log on to vCenter or ESXi API at %s:%s : %s" % (username, hostname, port, e.msg))
except (requests.ConnectionError, ssl.SSLError) as e: except (requests.ConnectionError, ssl.SSLError) as e:
module.fail_json(msg="Unable to connect to vCenter or ESXi API at %s on TCP/443: %s" % (hostname, e)) module.fail_json(msg="Unable to connect to vCenter or ESXi API at %s on TCP/%s: %s" % (hostname, port, e))
except vmodl.fault.InvalidRequest as e: except vmodl.fault.InvalidRequest as e:
# Request is malformed # Request is malformed
module.fail_json(msg="Failed to get a response from server %s as " module.fail_json(msg="Failed to get a response from server %s:%s as "
"request is malformed: %s" % (hostname, e.msg)) "request is malformed: %s" % (hostname, port, e.msg))
except Exception as e: except Exception as e:
module.fail_json(msg="Unknown error while connecting to vCenter or ESXi API at %s: %s" % (hostname, e)) module.fail_json(msg="Unknown error while connecting to vCenter or ESXi API at %s:%s : %s" % (hostname, port, e))
if service_instance is None: if service_instance is None:
module.fail_json(msg="Unknown error while connecting to vCenter or ESXi API at %s" % hostname) module.fail_json(msg="Unknown error while connecting to vCenter or ESXi API at %s:%s" % (hostname, port))
# Disabling atexit should be used in special cases only. # Disabling atexit should be used in special cases only.
# Such as IP change of the ESXi host which removes the connection anyway. # Such as IP change of the ESXi host which removes the connection anyway.

6
lib/ansible/utils/module_docs_fragments/vmware.py
View file

@ -41,4 +41,10 @@ options:
required: False required: False
default: 'True' default: 'True'
choices: ['True', 'False'] choices: ['True', 'False']
port:
description:
- The port number of the vSphere vCenter or ESXi server.
required: False
default: 443
version_added: 2.5
''' '''