diff options
-rwxr-xr-x | deployment/inventory/vsphere/vms/vmware_inventory.py | 4 | ||||
-rw-r--r-- | deployment/playbooks/library/vmware_folder.py | 22 | ||||
-rw-r--r-- | deployment/playbooks/library/vmware_resource_pool.py | 25 |
3 files changed, 32 insertions, 19 deletions
diff --git a/deployment/inventory/vsphere/vms/vmware_inventory.py b/deployment/inventory/vsphere/vms/vmware_inventory.py index 59cea196..cdb6bd13 100755 --- a/deployment/inventory/vsphere/vms/vmware_inventory.py +++ b/deployment/inventory/vsphere/vms/vmware_inventory.py @@ -191,7 +191,7 @@ class VMWareInventory(object): # apply defaults for k, v in defaults['vmware'].items(): if not config.has_option('vmware', k): - config.set('vmware', k, str(v)) + config.set('vmware', k, str(v)) # where is the cache? self.cache_dir = os.path.expanduser(config.get('vmware', 'cache_path')) @@ -263,7 +263,7 @@ class VMWareInventory(object): if hasattr(ssl, 'SSLContext'): # older ssl libs do not have an SSLContext method: - # context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) + # context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) # AttributeError: 'module' object has no attribute 'SSLContext' # older pyvmomi version also do not have an sslcontext kwarg: # https://github.com/vmware/pyvmomi/commit/92c1de5056be7c5390ac2a28eb08ad939a4b7cdd diff --git a/deployment/playbooks/library/vmware_folder.py b/deployment/playbooks/library/vmware_folder.py index d223768e..8e1d9665 100644 --- a/deployment/playbooks/library/vmware_folder.py +++ b/deployment/playbooks/library/vmware_folder.py @@ -100,7 +100,13 @@ except ImportError: HAS_PYVMOMI = False from ansible.module_utils import basic # noqa -from ansible.module_utils import vmware # noqa +from ansible.module_utils.vmware import ( # noqa + connect_to_api, + vmware_argument_spec, + find_datacenter_by_name, + find_cluster_by_name_datacenter, + wait_for_task, +) class VMwareFolder(object): @@ -120,12 +126,12 @@ class VMwareFolder(object): self.folder_name = None self.folder_expanded = None self.folder_full_path = [] - self.content = vmware.connect_to_api(module) + self.content = connect_to_api(module) def find_host_by_cluster_datacenter(self): - self.dc_obj = vmware.find_datacenter_by_name( + self.dc_obj = find_datacenter_by_name( self.content, self.datacenter) - self.cluster_obj = vmware.find_cluster_by_name_datacenter( + self.cluster_obj = find_cluster_by_name_datacenter( self.dc_obj, self.cluster) for host in self.cluster_obj.host: @@ -194,7 +200,7 @@ class VMwareFolder(object): task = self.get_obj([vim.Folder], f).Destroy() try: - success, result = vmware.wait_for_task(task) + success, result = wait_for_task(task) except Exception: self.module.fail_json( msg="Failed to remove folder '%s'" % self.folder) @@ -204,9 +210,9 @@ class VMwareFolder(object): def state_add_folder(self): changed = True - self.dc_obj = vmware.find_datacenter_by_name( + self.dc_obj = find_datacenter_by_name( self.content, self.datacenter) - self.cluster_obj = vmware.find_cluster_by_name_datacenter( + self.cluster_obj = find_cluster_by_name_datacenter( self.dc_obj, self.cluster) self.folder_expanded = self.folder.split("/") index = 0 @@ -236,7 +242,7 @@ class VMwareFolder(object): def main(): - argument_spec = vmware.vmware_argument_spec() + argument_spec = vmware_argument_spec() argument_spec.update(dict(datacenter=dict(required=True, type='str'), cluster=dict(required=True, type='str'), folder=dict(required=True, type='str'), diff --git a/deployment/playbooks/library/vmware_resource_pool.py b/deployment/playbooks/library/vmware_resource_pool.py index 7dab5526..0c9ebbd2 100644 --- a/deployment/playbooks/library/vmware_resource_pool.py +++ b/deployment/playbooks/library/vmware_resource_pool.py @@ -158,7 +158,14 @@ except ImportError: HAS_PYVMOMI = False from ansible.module_utils import basic # noqa -from ansible.module_utils import vmware # noqa +from ansible.module_utils.vmware import ( # noqa + get_all_objs, + connect_to_api, + vmware_argument_spec, + find_datacenter_by_name, + find_cluster_by_name_datacenter, + wait_for_task, +) class VMwareResourcePool(object): @@ -185,12 +192,12 @@ class VMwareResourcePool(object): self.cluster_obj = None self.host_obj = None self.resource_pool_obj = None - self.content = vmware.connect_to_api(module) + self.content = connect_to_api(module) def find_host_by_cluster_datacenter(self): - self.dc_obj = vmware.find_datacenter_by_name( + self.dc_obj = find_datacenter_by_name( self.content, self.datacenter) - self.cluster_obj = vmware.find_cluster_by_name_datacenter( + self.cluster_obj = find_cluster_by_name_datacenter( self.dc_obj, self.cluster) for host in self.cluster_obj.host: @@ -202,7 +209,7 @@ class VMwareResourcePool(object): def select_resource_pool(self, host): pool_obj = None - resource_pools = vmware.get_all_objs(self.content, [vim.ResourcePool]) + resource_pools = get_all_objs(self.content, [vim.ResourcePool]) pool_selections = self.get_obj( [vim.ResourcePool], self.resource_pool, return_all=True) @@ -263,7 +270,7 @@ class VMwareResourcePool(object): resource_pool = self.select_resource_pool(self.host_obj) try: task = self.resource_pool_obj.Destroy() - success, result = vmware.wait_for_task(task) + success, result = wait_for_task(task) except Exception: self.module.fail_json( @@ -292,9 +299,9 @@ class VMwareResourcePool(object): mem_alloc.shares = mem_alloc_shares rp_spec.memoryAllocation = mem_alloc - self.dc_obj = vmware.find_datacenter_by_name( + self.dc_obj = find_datacenter_by_name( self.content, self.datacenter) - self.cluster_obj = vmware.find_cluster_by_name_datacenter( + self.cluster_obj = find_cluster_by_name_datacenter( self.dc_obj, self.cluster) rootResourcePool = self.cluster_obj.resourcePool rootResourcePool.CreateResourcePool(self.resource_pool, rp_spec) @@ -314,7 +321,7 @@ class VMwareResourcePool(object): def main(): - argument_spec = vmware.vmware_argument_spec() + argument_spec = vmware_argument_spec() argument_spec.update(dict(datacenter=dict(required=True, type='str'), cluster=dict(required=True, type='str'), resource_pool=dict(required=True, type='str'), |