diff options
| author |   Clint Byrum <clint@fewbar.com> | 2014-01-31 11:05:09 -0800 |
|---|---|---|
| committer | Clint Byrum <clint@fewbar.com> | 2014-01-31 11:13:22 -0800 |
| commit | f9ef45798719254ce66b6374c5f803b04ec86721 (patch) | |
| tree | 2e22bfd3a5ca5524399f884f980a93251d95b8e0 /examples | |
| parent | 6027346b9bcf7c8c4a4f91dbead6c42d2fefdd3d (diff) | |
Remove image parameter changing from merge
The merge tool originally was meant to merge somewhat different things,
and thus this was helpful in the early versions. However, at this point
we want parameters to be more stable and we don't generally merge things
that have their own image parameter.
Meanwhile this feature caused problems as we change resource names.
This is a backward incompatible change of default behavior, but the old
behavior can be had again by passing --change-image-params.
Change-Id: I78cf31f0443f3d9f274758f5471a5bca9155635d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/source2_lib_result.yaml | 4 | ||||
| -rw-r--r-- | examples/source_include_subkey_result.yaml | 4 | ||||
| -rw-r--r-- | examples/source_lib_result.yaml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/source2_lib_result.yaml b/examples/source2_lib_result.yaml index d4b19768..172dce0f 100644 --- a/examples/source2_lib_result.yaml +++ b/examples/source2_lib_result.yaml @@ -1,7 +1,7 @@ Description: examples/source2.yaml HeatTemplateFormatVersion: '2012-12-12' Parameters: - GenericBImage: + BImage: Type: String ImportantValue: Default: a_default @@ -12,5 +12,5 @@ Resources: my_meta: Foo Properties: image: - Ref: GenericBImage + Ref: BImage Type: OS::Nova::Server diff --git a/examples/source_include_subkey_result.yaml b/examples/source_include_subkey_result.yaml index f5ff80ea..641e8148 100644 --- a/examples/source_include_subkey_result.yaml +++ b/examples/source_include_subkey_result.yaml @@ -1,7 +1,7 @@ Description: examples/source_include_subkey.yaml HeatTemplateFormatVersion: '2012-12-12' Parameters: - GenericBImage: + Foo: Type: String Resources: GenericB: @@ -10,5 +10,5 @@ Resources: Ref: ImportantValue Properties: image: - Ref: GenericBImage + Ref: Foo Type: OS::Nova::Server diff --git a/examples/source_lib_result.yaml b/examples/source_lib_result.yaml index a165cabf..ceb8a321 100644 --- a/examples/source_lib_result.yaml +++ b/examples/source_lib_result.yaml @@ -1,14 +1,14 @@ Description: examples/source.yaml HeatTemplateFormatVersion: '2012-12-12' Parameters: - AImage: null Default: my_image + SourceImage: null Type: String Resources: A: Properties: image: - Ref: AImage + Ref: SourceImage Type: OS::Nova::Server B: Metadata: |