From 948c05ac5e3c17f3075823ad91c7d09383e8352b Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Wed, 22 Apr 2015 10:18:34 -0400 Subject: [PATCH] moved new module to proper subdir fixed doc issues minor code adjustments --- .../modules/extras/cloud/vmware/__init__.py | 0 .../cloud/{ => vmware}/vmware_datacenter.py | 36 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 lib/ansible/modules/extras/cloud/vmware/__init__.py rename lib/ansible/modules/extras/cloud/{ => vmware}/vmware_datacenter.py (88%) diff --git a/lib/ansible/modules/extras/cloud/vmware/__init__.py b/lib/ansible/modules/extras/cloud/vmware/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/lib/ansible/modules/extras/cloud/vmware_datacenter.py b/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py similarity index 88% rename from lib/ansible/modules/extras/cloud/vmware_datacenter.py rename to lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py index c3125760484..35cf7fa4692 100644 --- a/lib/ansible/modules/extras/cloud/vmware_datacenter.py +++ b/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py @@ -1,4 +1,4 @@ -#!/bin/python +#!/usr/bin/python # -*- coding: utf-8 -*- # (c) 2015, Joseph Callen @@ -21,38 +21,39 @@ DOCUMENTATION = ''' --- module: vmware_datacenter -short_description: Create VMware vSphere Datacenter +short_description: Manage VMware vSphere Datacenters description: - - Create VMware vSphere Datacenter + - Manage VMware vSphere Datacenters version_added: 2.0 author: Joseph Callen notes: -requirements: - Tested on vSphere 5.5 - - PyVmomi installed +requirements: + - PyVmomi options: - hostname: + hostname: description: - - The hostname or IP address of the vSphere vCenter + - The hostname or IP address of the vSphere vCenter API server required: True - version_added: 2.0 username: description: - The username of the vSphere vCenter required: True aliases: ['user', 'admin'] - version_added: 2.0 password: description: - The password of the vSphere vCenter required: True aliases: ['pass', 'pwd'] - version_added: 2.0 datacenter_name: description: - The name of the datacenter the cluster will be created in. required: True - version_added: 2.0 + state: + description: + - If the datacenter should be present or absent + choices: ['present', 'absent'] + required: True ''' EXAMPLES = ''' @@ -133,10 +134,6 @@ def state_destroy_datacenter(module): module.fail_json(msg=method_fault.msg) -def state_update_datacenter(module): - module.exit_json(changed=False, msg="Currently Not Implemented") - - def state_exit_unchanged(module): module.exit_json(changed=False) @@ -144,8 +141,12 @@ def state_exit_unchanged(module): def main(): argument_spec = vmware_argument_spec() - argument_spec.update(dict(datacenter_name=dict(required=True, type='str'), - state=dict(default='present', choices=['present', 'absent'], type='str'))) + argument_spec.update( + dict( + datacenter_name=dict(required=True, type='str'), + state=dict(required=True, choices=['present', 'absent'], type='str'), + ) + ) module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True) if not HAS_PYVMOMI: @@ -157,7 +158,6 @@ def main(): 'absent': state_exit_unchanged, }, 'present': { - 'update': state_update_datacenter, 'present': state_exit_unchanged, 'absent': state_create_datacenter, }