9af3ec5865
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
24 lines
1.4 KiB
YAML
24 lines
1.4 KiB
YAML
# This template configures each role to use Vlans on a single nic for
|
|
# each isolated network.
|
|
# This template assumes use of network-isolation.yaml.
|
|
#
|
|
# FIXME: if/when we add functionality to heatclient to include heat
|
|
# environment files we should think about using it here to automatically
|
|
# include network-isolation.yaml.
|
|
resource_registry:
|
|
OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/cinder-storage.yaml
|
|
OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/single-nic-vlans/compute.yaml
|
|
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller.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
|
|
|
|
# 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)
|
|
NeutronExternalNetworkBridge: "''"
|