Merge "Use parameter_defaults in env files"
This commit is contained in:
commit
ff84b24800
|
@ -12,7 +12,11 @@ resource_registry:
|
||||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml
|
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
|
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
|
# This sets 'external_network_bridge' in l3_agent.ini to an empty string
|
||||||
# so that external networks act like provider bridge networks (they
|
# so that external networks act like provider bridge networks (they
|
||||||
# will plug into br-int instead of br-ex)
|
# will plug into br-int instead of br-ex)
|
||||||
|
|
|
@ -12,7 +12,11 @@ resource_registry:
|
||||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/swift-storage.yaml
|
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
|
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
|
# This sets 'external_network_bridge' in l3_agent.ini to an empty string
|
||||||
# so that external networks act like provider bridge networks (they
|
# so that external networks act like provider bridge networks (they
|
||||||
# will plug into br-int instead of br-ex)
|
# will plug into br-int instead of br-ex)
|
||||||
|
|
Loading…
Reference in New Issue