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

reviewable/pr18780/r1
Michael DeHaan 14 years ago
parent 5e6bf63215
commit 07d17e4cb4

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

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

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

Loading…
Cancel
Save