From a12087715f0fe4251a95ab67120023d553c24a45 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Fri, 8 Apr 2016 10:59:07 +0200 Subject: 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 --- environments/puppet-tenant-vlan.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'environments/puppet-tenant-vlan.yaml') diff --git a/environments/puppet-tenant-vlan.yaml b/environments/puppet-tenant-vlan.yaml index 0df63caf..ed948bc5 100644 --- a/environments/puppet-tenant-vlan.yaml +++ b/environments/puppet-tenant-vlan.yaml @@ -1,4 +1,4 @@ -parameters: +parameter_defaults: NeutronNetworkType: vlan NeutronEnableTunnelling: false - NeutronNetworkVLANRanges: datacentre:1:1000 \ No newline at end of file + NeutronNetworkVLANRanges: datacentre:1:1000 -- cgit 1.2.3-korg