From 69f1dcc7cb1f881b9df0d0c5ac0c34627bc1d775 Mon Sep 17 00:00:00 2001 From: Clint Byrum Date: Wed, 25 Sep 2013 11:15:59 -0700 Subject: Add recursive whole-file __include__ tag We can now merge an entire file with minimal effort. Change-Id: If86657fb9f9cca0f048c9e01100a3667597a6596 --- examples/source2.yaml | 4 ++++ examples/source2_lib_result.yaml | 16 ++++++++++++++++ examples/source_include_subkey.yaml | 10 ++++++++++ examples/source_include_subkey_result.yaml | 14 ++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 examples/source2.yaml create mode 100644 examples/source2_lib_result.yaml create mode 100644 examples/source_include_subkey.yaml create mode 100644 examples/source_include_subkey_result.yaml (limited to 'examples') diff --git a/examples/source2.yaml b/examples/source2.yaml new file mode 100644 index 00000000..f59f85ef --- /dev/null +++ b/examples/source2.yaml @@ -0,0 +1,4 @@ +__include__: + path: examples/lib.yaml + params: + ImportantValue: Foo diff --git a/examples/source2_lib_result.yaml b/examples/source2_lib_result.yaml new file mode 100644 index 00000000..d4b19768 --- /dev/null +++ b/examples/source2_lib_result.yaml @@ -0,0 +1,16 @@ +Description: examples/source2.yaml +HeatTemplateFormatVersion: '2012-12-12' +Parameters: + GenericBImage: + Type: String + ImportantValue: + Default: a_default + Type: String +Resources: + GenericB: + Metadata: + my_meta: Foo + Properties: + image: + Ref: GenericBImage + Type: OS::Nova::Server diff --git a/examples/source_include_subkey.yaml b/examples/source_include_subkey.yaml new file mode 100644 index 00000000..be344cd8 --- /dev/null +++ b/examples/source_include_subkey.yaml @@ -0,0 +1,10 @@ +Parameters: + Foo: + Type: String +Resources: + __include__: + path: examples/lib.yaml + subkey: Resources + params: + BImage: + Ref: Foo diff --git a/examples/source_include_subkey_result.yaml b/examples/source_include_subkey_result.yaml new file mode 100644 index 00000000..f5ff80ea --- /dev/null +++ b/examples/source_include_subkey_result.yaml @@ -0,0 +1,14 @@ +Description: examples/source_include_subkey.yaml +HeatTemplateFormatVersion: '2012-12-12' +Parameters: + GenericBImage: + Type: String +Resources: + GenericB: + Metadata: + my_meta: + Ref: ImportantValue + Properties: + image: + Ref: GenericBImage + Type: OS::Nova::Server -- cgit 1.2.3-korg