summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--heat/engine/parameters.py2
-rw-r--r--heat/tests/test_parameters.py14
2 files changed, 15 insertions, 1 deletions
diff --git a/heat/engine/parameters.py b/heat/engine/parameters.py
index bc1bf281d..3776e1af1 100644
--- a/heat/engine/parameters.py
+++ b/heat/engine/parameters.py
@@ -120,7 +120,7 @@ class Parameter(object):
if self.no_echo():
return '******'
else:
- return value
+ return str(value)
class NumberParam(Parameter):
diff --git a/heat/tests/test_parameters.py b/heat/tests/test_parameters.py
index dc530e797..b19831ba8 100644
--- a/heat/tests/test_parameters.py
+++ b/heat/tests/test_parameters.py
@@ -329,3 +329,17 @@ class ParametersTest(unittest.TestCase):
'AWS::StackName': True}
self.assertEqual(params.map(lambda p: p.has_default()), expected)
+
+ def test_map_str(self):
+ template = {'Parameters': {'Foo': {'Type': 'String'},
+ 'Bar': {'Type': 'Number'}}}
+ params = parameters.Parameters('test_params', template, {
+ 'Foo': 'foo', 'Bar': 42})
+
+ expected = {'Foo': 'foo',
+ 'Bar': '42',
+ 'AWS::Region': 'ap-southeast-1',
+ 'AWS::StackId': 'None',
+ 'AWS::StackName': 'test_params'}
+
+ self.assertEqual(params.map(str), expected)