Browse Source

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
changes/05/303305/2
Jiri Stransky 5 years ago
committed by Dan Prince
parent
commit
a12087715f
  1. 2
      environments/docker.yaml
  2. 2
      environments/manage-firewall.yaml
  3. 2
      environments/mongodb-nojournal.yaml
  4. 2
      environments/puppet-ceph-devel.yaml
  5. 4
      environments/puppet-tenant-vlan.yaml
  6. 2
      environments/updates/update-from-keystone-admin-internal-api.yaml

2
environments/docker.yaml

@ -3,7 +3,7 @@ resource_registry:
OS::TripleO::ComputePostDeployment: ../docker/compute-post.yaml
OS::TripleO::NodeUserData: ../docker/firstboot/install_docker_agents.yaml
parameters:
parameter_defaults:
NovaImage: atomic-image
parameter_defaults:

2
environments/manage-firewall.yaml

@ -1,2 +1,2 @@
parameters:
parameter_defaults:
ManageFirewall: true

2
environments/mongodb-nojournal.yaml

@ -1,5 +1,5 @@
# A Heat environment file which can be used to disable journal in MongoDb.
# Since, when journaling is enabled, MongoDb will create big journal file
# it can take time. In a CI environment for example journaling is not necessary.
parameters:
parameter_defaults:
MongoDbNoJournal: true

2
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.

4
environments/puppet-tenant-vlan.yaml

@ -1,4 +1,4 @@
parameters:
parameter_defaults:
NeutronNetworkType: vlan
NeutronEnableTunnelling: false
NeutronNetworkVLANRanges: datacentre:1:1000
NeutronNetworkVLANRanges: datacentre:1:1000

2
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

Loading…
Cancel
Save