summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2014-11-19 18:36:54 +0000
committerSteven Hardy <shardy@redhat.com>2014-11-19 18:36:54 +0000
commitae39ab240f32626cd6e2f3c7c265645ff82d38ae (patch)
treeb9c91c18ab468f60b8e111c0ab3972ea47e9cbf4
parente6949d0c48a27b612b1bbcb651cd7f160ec61148 (diff)
downloadpython-heatclient-ae39ab240f32626cd6e2f3c7c265645ff82d38ae.tar.gz
Add support for parameter_defaults in environment
https://review.openstack.org/#/c/131337/ adds support for a new section "parameter_defaults" in the environment, so support it in the client blueprint env-nested-usability Change-Id: Ia1f27102f31a42e7b58008a9b4886cde293308c6
-rw-r--r--heatclient/common/environment_format.py4
-rw-r--r--heatclient/tests/test_environment_format.py1
2 files changed, 3 insertions, 2 deletions
diff --git a/heatclient/common/environment_format.py b/heatclient/common/environment_format.py
index 82d6f1a..4f8e5c5 100644
--- a/heatclient/common/environment_format.py
+++ b/heatclient/common/environment_format.py
@@ -15,8 +15,8 @@ from heatclient.common.template_format import yaml_loader
import yaml
-SECTIONS = (PARAMETERS, RESOURCE_REGISTRY) = \
- ('parameters', 'resource_registry')
+SECTIONS = (PARAMETER_DEFAULTS, PARAMETERS, RESOURCE_REGISTRY) = \
+ ('parameter_defaults', 'parameters', 'resource_registry')
def parse(env_str):
diff --git a/heatclient/tests/test_environment_format.py b/heatclient/tests/test_environment_format.py
index 90205c3..702619d 100644
--- a/heatclient/tests/test_environment_format.py
+++ b/heatclient/tests/test_environment_format.py
@@ -26,6 +26,7 @@ class YamlEnvironmentTest(testtools.TestCase):
def test_minimal_yaml(self):
yaml1 = ''
yaml2 = '''
+parameter_defaults: {}
parameters: {}
resource_registry: {}
'''