openstack
/
heat-templates
Code Issues Proposed changes

Merge "Convert input values to str"

This commit is contained in:
Jenkins 2014-07-09 14:12:54 +00:00 committed by Gerrit Code Review
parent ded3baa712 8358a56053
commit 5aa27cc724
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hot/software-config/elements/heat-config/os-refresh-config/configure.d/55-heat-config
View File

@ -48,6 +48,14 @@ def invoke_hook(c, log):
log.warn('Skipping group %s with no hook script %s' % (
c['group'], hook_path))
else:
# Sanitize input values (bug 1333992). Convert all String
# inputs to strings if they're not already
hot_inputs = c.get('inputs', [])
for hot_input in hot_inputs:
if hot_input.get('type', None) == 'String' and \
not isinstance(hot_input['value'], basestring):
hot_input['value'] = str(hot_input['value'])
log.debug('Running %s' % hook_path)
subproc = subprocess.Popen([hook_path],
stdin=subprocess.PIPE,