Fixing digital_ocean documentation and a bug in os_subnet

reviewable/pr18780/r1
James Cammarata 10 years ago
parent 52626b4da9
commit 576ca33bdc

@ -99,7 +99,8 @@ options:
notes: notes:
- Two environment variables can be used, DO_API_KEY and DO_API_TOKEN. They both refer to the v2 token. - Two environment variables can be used, DO_API_KEY and DO_API_TOKEN. They both refer to the v2 token.
- Version 2 of DigitalOcean API is used. - As of Ansible 2.0, Version 2 of the DigitalOcean API is used.
- As of Ansible 2.0, the above parameters were changed significantly. If you are running 1.9.x or earlier, please use C(ansible-doc digital_ocean) to view the correct parameters for your version. Dedicated web docs will be available in the near future for the stable branch.
requirements: requirements:
- "python >= 2.6" - "python >= 2.6"
- dopy - dopy

@ -253,5 +253,5 @@ def main():
# this is magic, see lib/ansible/module_common.py # this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import * from ansible.module_utils.openstack import *
if __name__ '__main__': if __name__ == '__main__':
main() main()

Loading…
Cancel
Save