Add defaults and a link to os-client-config docs

Conflicts: lib/ansible/utils/module_docs_fragments/openstack.py

Add defaults and a link to os-client-config docs
Conflicts: lib/ansible/utils/module_docs_fragments/openstack.py
870afac2 · Monty Taylor · Toshio Kuratomi · 7a76d4e0 · 5983d64d · 1276420a
Commit 870afac2 authored May 11, 2015 by Monty Taylor Committed by Toshio Kuratomi May 29, 2015
Showing with 6 additions and 5 deletions

lib/ansible/modules/core
+1 -1

lib/ansible/modules/extras
+1 -1

lib/ansible/utils/module_docs_fragments/openstack.py
+2 -1

v2/ansible/modules/core
+1 -1

v2/ansible/modules/extras
+1 -1

No files found.
--- a/core @ 5983d64d
+++ b/core @ 5983d64d
-Subproject commit 6a50902237388d32fdc49da9eed3dc8641727551
+Subproject commit 5983d64d7728ea88ef27606e95e4aa34cde5ff46
--- a/extras @ 1276420a
+++ b/extras @ 1276420a
-Subproject commit 7d2135c38cbabfb9700650a5bd944ec7f5e18f1e
+Subproject commit 1276420a3a39340fcd9e053a1e621cdd89f480fa
--- a/lib/ansible/utils/module_docs_fragments/openstack.py
+++ b/lib/ansible/utils/module_docs_fragments/openstack.py
@@ -85,5 +85,6 @@ notes:
    can come from a yaml config file in /etc/ansible/openstack.yaml,
    /etc/openstack/clouds.yaml or ~/.config/openstack/clouds.yaml, then from
    standard environment variables, then finally by explicit parameters in
-    plays.
+    plays. More information can be found at
+    U(http://docs.openstack.org/developer/os-client-config)
 '''
--- a/core @ 85c8a892
+++ b/core @ 85c8a892
-Subproject commit 34784b7a617aa35d3b994c9f0795567afc6fb0b0
+Subproject commit 85c8a892c80b92730831d95fa654ef6d35b0eca0
--- a/extras @ 70ea0585
+++ b/extras @ 70ea0585
-Subproject commit 46e316a20a92b5a54b982eddb301eb3d57da397e
+Subproject commit 70ea05856356ad36f48b4bb7267d637efc56d292