diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-19 00:45:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-19 00:45:10 +0000 |
| commit | ff84b2480074a99fae6ece55f7a4c722d293d59b (patch) | |
| tree | 19e6bcc6bf215a4db8f574b810457d7cd599ffa1 /environments | |
| parent | 5426ea2f200a81cab1245d9aa02e2e47a440e3d6 (diff) | |
| parent | 9af3ec5865bb78374d0cb669b317eceee266e5c9 (diff) | |
Merge "Use parameter_defaults in env files"
Diffstat (limited to 'environments')
| -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) |