diff options
| author |   Jiri Stransky <jistr@redhat.com> | 2016-04-08 10:59:07 +0200 |
|---|---|---|
| committer |   Dan Prince <dprince@redhat.com> | 2016-04-11 14:15:39 -0400 |
| commit | a12087715f0fe4251a95ab67120023d553c24a45 (patch) | |
| tree | 6a9514b351b581e2ea824fe07fbd507ae9587766 /environments/updates | |
| parent | 0970068cbb49d7c4dde6eb2e324058f9b4652c6d (diff) | |
Always use parameter_defaults in environment files
In the environments/ subdirectory of tripleo-heat-templates, we mostly
use parameter_defaults, but some of the environment files still use
parameters. This can lead to confusing behavior with respect to
parameter priority when passing environment files to deploy/update
commands. Users might expect that subsequent environment files take
priority over preceding ones, but that might not be the case if the
preceding environment files use `parameters`, while the subsequent ones
use `parameter_defaults`.
This commit switches all `parameters:` uses in environments/
subdirectory to `parameter_defaults:`.
Change-Id: Ie4c03c7e7f5a5004a0384d35817135f357e9719b
Closes-Bug: #1567837
Diffstat (limited to 'environments/updates')
| -rw-r--r-- | environments/updates/update-from-keystone-admin-internal-api.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/updates/update-from-keystone-admin-internal-api.yaml b/environments/updates/update-from-keystone-admin-internal-api.yaml index 3c71ef1b..a9fa2bea 100644 --- a/environments/updates/update-from-keystone-admin-internal-api.yaml +++ b/environments/updates/update-from-keystone-admin-internal-api.yaml @@ -1,7 +1,7 @@ # This environment file provides a default value for ServiceNetMap where # Keystone Admin API service is running on the Internal API network -parameters: +parameter_defaults: ServiceNetMap: NeutronTenantNetwork: tenant CeilometerApiNetwork: internal_api |