Merge branch 'custom-facts' of https://github.com/jhoekx/ansible into jhoekx-custom-facts

Conflicts:
	lib/ansible/runner.py
reviewable/pr18780/r1
Michael DeHaan 13 years ago
commit f79a2cc6a3

@ -22,4 +22,6 @@
# facter
# ruby-json
echo '{ "ansible_facts":'
/usr/bin/facter --json
echo '}'

@ -18,4 +18,6 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
#
echo '{ "ansible_facts":'
/usr/bin/ohai
echo '}'

10
setup

@ -362,9 +362,11 @@ md5sum2 = os.popen("md5sum %s" % ansible_file).read().split()[0]
if md5sum != md5sum2:
changed = True
setup_options['written'] = ansible_file
setup_options['changed'] = changed
setup_options['md5sum'] = md5sum2
setup_result = {}
setup_result['written'] = ansible_file
setup_result['changed'] = changed
setup_result['md5sum'] = md5sum2
setup_result['ansible_facts'] = setup_options
print json.dumps(setup_options)
print json.dumps(setup_result)

Loading…
Cancel
Save