diff options
Diffstat (limited to 'lib/ansible/modules/cloud/digital_ocean/digital_ocean_domain.py')
| -rw-r--r-- | lib/ansible/modules/cloud/digital_ocean/digital_ocean_domain.py | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_domain.py b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_domain.py index 3e0f9017f1..7b3738d241 100644 --- a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_domain.py +++ b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_domain.py @@ -27,11 +27,6 @@ options: - Indicate desired state of the target. default: present choices: ['present', 'absent'] - oauth_token: - description: - - DigitalOcean api token. - version_added: "1.9.5" - aliases: ['API_TOKEN'] id: description: - Numeric, the droplet id you want to operate on. @@ -42,7 +37,7 @@ options: ip: description: - The IP address to point a domain at. - +extends_documentation_fragment: digital_ocean.documentation notes: - Environment variables DO_OAUTH_TOKEN can be used for the oauth_token. - As of Ansible 1.9.5 and 2.0, Version 2 of the DigitalOcean API is used, this removes C(client_id) and C(api_key) options in favor of C(oauth_token). @@ -84,7 +79,6 @@ import traceback from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.digital_ocean import DigitalOceanHelper from ansible.module_utils._text import to_native -from ansible.module_utils.basic import env_fallback class DoManager(DigitalOceanHelper, object): @@ -185,18 +179,16 @@ def core(module): def main(): + argument_spec = DigitalOceanHelper.digital_ocean_argument_spec() + argument_spec.update( + state=dict(choices=['present', 'absent'], default='present'), + name=dict(type='str'), + id=dict(aliases=['droplet_id'], type='int'), + ip=dict(type='str') + ) + module = AnsibleModule( - argument_spec=dict( - state=dict(choices=['present', 'absent'], default='present'), - oauth_token=dict( - aliases=['API_TOKEN'], - no_log=True, - fallback=(env_fallback, ['DO_API_TOKEN', 'DO_API_KEY', 'DO_OAUTH_TOKEN']) - ), - name=dict(type='str'), - id=dict(aliases=['droplet_id'], type='int'), - ip=dict(type='str'), - ), + argument_spec=argument_spec, required_one_of=( ['id', 'name'], ), |