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/puppet-ceph-devel.yaml | |
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/puppet-ceph-devel.yaml')
-rw-r--r-- | environments/puppet-ceph-devel.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/puppet-ceph-devel.yaml b/environments/puppet-ceph-devel.yaml index fb63af65..a2d1100f 100644 --- a/environments/puppet-ceph-devel.yaml +++ b/environments/puppet-ceph-devel.yaml @@ -1,7 +1,7 @@ # A Heat environment file which can be used to enable a Ceph # storage cluster using the controller and ceph nodes. # Rbd backends are enabled for Cinder, Glance, Gnocchi and Nova. -parameters: +parameter_defaults: #NOTE: These ID's and keys should be regenerated for # a production deployment. What is here is suitable for # developer and CI testing only. |