diff options
| author |   James Slagle <jslagle@redhat.com> | 2015-07-09 07:45:54 -0400 |
|---|---|---|
| committer | James Slagle <jslagle@redhat.com> | 2015-07-09 11:19:43 -0400 |
| commit | 9af3ec5865bb78374d0cb669b317eceee266e5c9 (patch) | |
| tree | ff78d2090caab63c27a956a775bc3048fcf1b21b | |
| parent | 0405a6b248a8328edc1ca050be7e33f436b29c77 (diff) | |
Use parameter_defaults in env files
Switch to using parameter_defaults in environment files instead of a
parameters section. Using a parameters section to set top level
parameters breaks Tuskar based deployments because Tuskar prefixes the
name of the top level parameters with a role name and version, thus
changing the name of the parameter. When the environment file is then
used to set a top level parameter, Heat fails with an error during
template validation:
ERROR: The Parameter (NeutronExternalNetworkBridge) was not defined in template
Change-Id: I605651a8ebdbd0b2baf7bcea198c2988efb55f31
| -rw-r--r-- | environments/net-bond-with-vlans.yaml | 6 | ||||
| -rw-r--r-- | environments/net-single-nic-with-vlans.yaml | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/environments/net-bond-with-vlans.yaml b/environments/net-bond-with-vlans.yaml index 73f71324..9600fc7e 100644 --- a/environments/net-bond-with-vlans.yaml +++ b/environments/net-bond-with-vlans.yaml @@ -12,7 +12,11 @@ resource_registry: OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/ceph-storage.yaml -parameters: +# We use parameter_defaults instead of parameters here because Tuskar munges +# the names of top level and role level parameters with the role name and a +# version. Using parameter_defaults makes it such that if the parameter name is +# not defined in the template, we don't get an error. +parameter_defaults: # This sets 'external_network_bridge' in l3_agent.ini to an empty string # so that external networks act like provider bridge networks (they # will plug into br-int instead of br-ex) diff --git a/environments/net-single-nic-with-vlans.yaml b/environments/net-single-nic-with-vlans.yaml index 8561acd3..bdfeadd3 100644 --- a/environments/net-single-nic-with-vlans.yaml +++ b/environments/net-single-nic-with-vlans.yaml @@ -12,7 +12,11 @@ resource_registry: OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/swift-storage.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/ceph-storage.yaml -parameters: +# We use parameter_defaults instead of parameters here because Tuskar munges +# the names of top level and role level parameters with the role name and a +# version. Using parameter_defaults makes it such that if the parameter name is +# not defined in the template, we don't get an error. +parameter_defaults: # This sets 'external_network_bridge' in l3_agent.ini to an empty string # so that external networks act like provider bridge networks (they # will plug into br-int instead of br-ex) |