summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2015-05-12 10:32:43 -0500
committerJames Cammarata <jimi@sngx.net>2015-05-12 10:32:43 -0500
commit576ca33bdc968edb4fb303c41ca0157d85fd30ab (patch)
treebe1020030436b97e26fede080a86ac46181a2948
parent52626b4da99f5b6135a328f6e8dbdb85241b205a (diff)
downloadansible-modules-core-576ca33bdc968edb4fb303c41ca0157d85fd30ab.tar.gz
Fixing digital_ocean documentation and a bug in os_subnet
-rw-r--r--cloud/digital_ocean/digital_ocean.py3
-rw-r--r--cloud/openstack/os_subnet.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/cloud/digital_ocean/digital_ocean.py b/cloud/digital_ocean/digital_ocean.py
index a6190a65..f4475a10 100644
--- a/cloud/digital_ocean/digital_ocean.py
+++ b/cloud/digital_ocean/digital_ocean.py
@@ -99,7 +99,8 @@ options:
notes:
- 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:
- "python >= 2.6"
- dopy
diff --git a/cloud/openstack/os_subnet.py b/cloud/openstack/os_subnet.py
index 61152d75..75bf7b33 100644
--- a/cloud/openstack/os_subnet.py
+++ b/cloud/openstack/os_subnet.py
@@ -253,5 +253,5 @@ def main():
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
-if __name__ '__main__':
+if __name__ == '__main__':
main()