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 /undercloud-source.yaml | |
| 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 'undercloud-source.yaml')
| -rw-r--r-- | undercloud-source.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 801c7916..3ac148c9 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -33,7 +33,7 @@ Parameters: Description: The password for the Heat service account, used by the Heat services. Type: String NoEcho: true - Image: + undercloudImage: Default: undercloud Type: String NeutronPassword: @@ -165,7 +165,7 @@ Resources: Type: OS::Nova::Server Properties: image: - Ref: Image + Ref: undercloudImage flavor: Ref: Flavor key_name: |