cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Conflicts:
	lib/ansible/utils/module_docs_fragments/openstack.py
This commit is contained in:
Monty Taylor 2015-05-11 08:10:37 -04:00 committed by Toshio Kuratomi
parent 7a76d4e03b
commit 870afac287
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/core

@ -1 +1 @@
Subproject commit 6a50902237388d32fdc49da9eed3dc8641727551
Subproject commit 5983d64d7728ea88ef27606e95e4aa34cde5ff46

2
lib/ansible/modules/extras

@ -1 +1 @@
Subproject commit 7d2135c38cbabfb9700650a5bd944ec7f5e18f1e
Subproject commit 1276420a3a39340fcd9e053a1e621cdd89f480fa

3
lib/ansible/utils/module_docs_fragments/openstack.py
View file

@ -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)
'''

2
v2/ansible/modules/core

@ -1 +1 @@
Subproject commit 34784b7a617aa35d3b994c9f0795567afc6fb0b0
Subproject commit 85c8a892c80b92730831d95fa654ef6d35b0eca0

2
v2/ansible/modules/extras

@ -1 +1 @@
Subproject commit 46e316a20a92b5a54b982eddb301eb3d57da397e
Subproject commit 70ea05856356ad36f48b4bb7267d637efc56d292