Merge pull request #1624 from jcpowermac/vmware_host_fix_20
Resolves issue with vmware_host module for v2.0
This commit is contained in:
Brian Coca
commit
9f67ed64a3
1 changed files with 98 additions and 101 deletions
|
|
@ -87,102 +87,118 @@ except ImportError:
|
|||
HAS_PYVMOMI = False
|
||||
|
||||
|
||||
def find_host_by_cluster_datacenter(module):
|
||||
datacenter_name = module.params['datacenter_name']
|
||||
cluster_name = module.params['cluster_name']
|
||||
content = module.params['content']
|
||||
esxi_hostname = module.params['esxi_hostname']
|
||||
class VMwareHost(object):
|
||||
def __init__(self, module):
|
||||
self.module = module
|
||||
self.datacenter_name = module.params['datacenter_name']
|
||||
self.cluster_name = module.params['cluster_name']
|
||||
self.esxi_hostname = module.params['esxi_hostname']
|
||||
self.esxi_username = module.params['esxi_username']
|
||||
self.esxi_password = module.params['esxi_password']
|
||||
self.state = module.params['state']
|
||||
self.dc = None
|
||||
self.cluster = None
|
||||
self.host = None
|
||||
self.content = connect_to_api(module)
|
||||
|
||||
dc = find_datacenter_by_name(content, datacenter_name)
|
||||
cluster = find_cluster_by_name_datacenter(dc, cluster_name)
|
||||
def process_state(self):
|
||||
try:
|
||||
# Currently state_update_dvs is not implemented.
|
||||
host_states = {
|
||||
'absent': {
|
||||
'present': self.state_remove_host,
|
||||
'absent': self.state_exit_unchanged,
|
||||
},
|
||||
'present': {
|
||||
'present': self.state_exit_unchanged,
|
||||
'absent': self.state_add_host,
|
||||
}
|
||||
}
|
||||
|
||||
for host in cluster.host:
|
||||
if host.name == esxi_hostname:
|
||||
return host, cluster
|
||||
host_states[self.state][self.check_host_state()]()
|
||||
|
||||
return None, cluster
|
||||
except vmodl.RuntimeFault as runtime_fault:
|
||||
self.module.fail_json(msg=runtime_fault.msg)
|
||||
except vmodl.MethodFault as method_fault:
|
||||
self.module.fail_json(msg=method_fault.msg)
|
||||
except Exception as e:
|
||||
self.module.fail_json(msg=str(e))
|
||||
|
||||
def find_host_by_cluster_datacenter(self):
|
||||
self.dc = find_datacenter_by_name(self.content, self.datacenter_name)
|
||||
self.cluster = find_cluster_by_name_datacenter(self.dc, self.cluster_name)
|
||||
|
||||
def add_host_to_vcenter(module):
|
||||
cluster = module.params['cluster']
|
||||
for host in self.cluster.host:
|
||||
if host.name == self.esxi_hostname:
|
||||
return host, self.cluster
|
||||
|
||||
host_connect_spec = vim.host.ConnectSpec()
|
||||
host_connect_spec.hostName = module.params['esxi_hostname']
|
||||
host_connect_spec.userName = module.params['esxi_username']
|
||||
host_connect_spec.password = module.params['esxi_password']
|
||||
host_connect_spec.force = True
|
||||
host_connect_spec.sslThumbprint = ""
|
||||
as_connected = True
|
||||
esxi_license = None
|
||||
resource_pool = None
|
||||
return None, self.cluster
|
||||
|
||||
try:
|
||||
task = cluster.AddHost_Task(host_connect_spec, as_connected, resource_pool, esxi_license)
|
||||
def add_host_to_vcenter(self):
|
||||
host_connect_spec = vim.host.ConnectSpec()
|
||||
host_connect_spec.hostName = self.esxi_hostname
|
||||
host_connect_spec.userName = self.esxi_username
|
||||
host_connect_spec.password = self.esxi_password
|
||||
host_connect_spec.force = True
|
||||
host_connect_spec.sslThumbprint = ""
|
||||
as_connected = True
|
||||
esxi_license = None
|
||||
resource_pool = None
|
||||
|
||||
try:
|
||||
task = self.cluster.AddHost_Task(host_connect_spec, as_connected, resource_pool, esxi_license)
|
||||
success, result = wait_for_task(task)
|
||||
return success, result
|
||||
except TaskError as add_task_error:
|
||||
# This is almost certain to fail the first time.
|
||||
# In order to get the sslThumbprint we first connect
|
||||
# get the vim.fault.SSLVerifyFault then grab the sslThumbprint
|
||||
# from that object.
|
||||
#
|
||||
# args is a tuple, selecting the first tuple
|
||||
ssl_verify_fault = add_task_error.args[0]
|
||||
host_connect_spec.sslThumbprint = ssl_verify_fault.thumbprint
|
||||
|
||||
task = self.cluster.AddHost_Task(host_connect_spec, as_connected, resource_pool, esxi_license)
|
||||
success, result = wait_for_task(task)
|
||||
return success, result
|
||||
except TaskError as add_task_error:
|
||||
# This is almost certain to fail the first time.
|
||||
# In order to get the sslThumbprint we first connect
|
||||
# get the vim.fault.SSLVerifyFault then grab the sslThumbprint
|
||||
# from that object.
|
||||
#
|
||||
# args is a tuple, selecting the first tuple
|
||||
ssl_verify_fault = add_task_error.args[0]
|
||||
host_connect_spec.sslThumbprint = ssl_verify_fault.thumbprint
|
||||
|
||||
task = cluster.AddHost_Task(host_connect_spec, as_connected, resource_pool, esxi_license)
|
||||
success, result = wait_for_task(task)
|
||||
return success, result
|
||||
def state_exit_unchanged(self):
|
||||
self.module.exit_json(changed=False)
|
||||
|
||||
def state_remove_host(self):
|
||||
changed = True
|
||||
result = None
|
||||
if not self.module.check_mode:
|
||||
if not self.host.runtime.inMaintenanceMode:
|
||||
maintenance_mode_task = self.host.EnterMaintenanceMode_Task(300, True, None)
|
||||
changed, result = wait_for_task(maintenance_mode_task)
|
||||
|
||||
def state_exit_unchanged(module):
|
||||
module.exit_json(changed=False)
|
||||
if changed:
|
||||
task = self.host.Destroy_Task()
|
||||
changed, result = wait_for_task(task)
|
||||
else:
|
||||
raise Exception(result)
|
||||
self.module.exit_json(changed=changed, result=str(result))
|
||||
|
||||
def state_update_host(self):
|
||||
self.module.exit_json(changed=False, msg="Currently not implemented.")
|
||||
|
||||
def state_remove_host(module):
|
||||
host = module.params['host']
|
||||
changed = True
|
||||
result = None
|
||||
if not module.check_mode:
|
||||
if not host.runtime.inMaintenanceMode:
|
||||
maintenance_mode_task = host.EnterMaintenanceMode_Task(300, True, None)
|
||||
changed, result = wait_for_task(maintenance_mode_task)
|
||||
def state_add_host(self):
|
||||
changed = True
|
||||
result = None
|
||||
|
||||
if changed:
|
||||
task = host.Destroy_Task()
|
||||
changed, result = wait_for_task(task)
|
||||
if not self.module.check_mode:
|
||||
changed, result = self.add_host_to_vcenter()
|
||||
self.module.exit_json(changed=changed, result=str(result))
|
||||
|
||||
def check_host_state(self):
|
||||
self.host, self.cluster = self.find_host_by_cluster_datacenter()
|
||||
|
||||
if self.host is None:
|
||||
return 'absent'
|
||||
else:
|
||||
raise Exception(result)
|
||||
module.exit_json(changed=changed, result=str(result))
|
||||
|
||||
|
||||
def state_update_host(module):
|
||||
module.exit_json(changed=False, msg="Currently not implemented.")
|
||||
|
||||
|
||||
def state_add_host(module):
|
||||
|
||||
changed = True
|
||||
result = None
|
||||
|
||||
if not module.check_mode:
|
||||
changed, result = add_host_to_vcenter(module)
|
||||
module.exit_json(changed=changed, result=str(result))
|
||||
|
||||
|
||||
def check_host_state(module):
|
||||
|
||||
content = connect_to_api(module)
|
||||
module.params['content'] = content
|
||||
|
||||
host, cluster = find_host_by_cluster_datacenter(module)
|
||||
|
||||
module.params['cluster'] = cluster
|
||||
if host is None:
|
||||
return 'absent'
|
||||
else:
|
||||
module.params['host'] = host
|
||||
return 'present'
|
||||
return 'present'
|
||||
|
||||
|
||||
def main():
|
||||
|
|
@ -199,27 +215,8 @@ def main():
|
|||
if not HAS_PYVMOMI:
|
||||
module.fail_json(msg='pyvmomi is required for this module')
|
||||
|
||||
try:
|
||||
# Currently state_update_dvs is not implemented.
|
||||
host_states = {
|
||||
'absent': {
|
||||
'present': state_remove_host,
|
||||
'absent': state_exit_unchanged,
|
||||
},
|
||||
'present': {
|
||||
'present': state_exit_unchanged,
|
||||
'absent': state_add_host,
|
||||
}
|
||||
}
|
||||
|
||||
host_states[module.params['state']][check_host_state(module)](module)
|
||||
|
||||
except vmodl.RuntimeFault as runtime_fault:
|
||||
module.fail_json(msg=runtime_fault.msg)
|
||||
except vmodl.MethodFault as method_fault:
|
||||
module.fail_json(msg=method_fault.msg)
|
||||
except Exception as e:
|
||||
module.fail_json(msg=str(e))
|
||||
vmware_host = VMwareHost(module)
|
||||
vmware_host.process_state()
|
||||
|
||||
from ansible.module_utils.vmware import *
|
||||
from ansible.module_utils.basic import *
|
||||
|
|
|
|||
Loading…
Reference in a new issue