Fixed up KV munging in runner, misc fixes to copy, setup, and template modules

This commit is contained in:
Michael DeHaan 2012-02-26 19:55:26 -05:00
parent 5e6bf63215
commit 07d17e4cb4
3 changed files with 4 additions and 1 deletions

1
copy
View file

@ -2,6 +2,7 @@
import sys
import os
import shlex
try:
import json

3
setup
View file

@ -16,7 +16,7 @@ except ImportError:
input_data = sys.argv[1:]
new_options = dict([ x.split('=') for x in input_data ])
ansible_file = new_options.get('metadata', DEFAULT_ANSIBLE_SETUP)
ansible_dir = os.path.dirname(metadata)
ansible_dir = os.path.dirname(ansible_file)
# create the config dir if it doesn't exist
@ -24,6 +24,7 @@ if not os.path.exists(ansible_dir):
os.makedirs(ansible_dir)
changed = False
md5sum = None
if not os.path.exists(ansible_file):
changed = True
else:

View file

@ -3,6 +3,7 @@
import sys
import os
import jinja2
import shlex
try:
import json
except ImportError: