diff options
| author |   Dan Sneddon <dsneddon@redhat.com> | 2016-01-19 13:36:29 -0800 |
|---|---|---|
| committer |   Giulio Fidente <gfidente@redhat.com> | 2016-03-05 03:22:03 +0100 |
| commit | 365c35cc6e1e588215ab6d63143b84bb56dce376 (patch) | |
| tree | 81c2b3bf4828051ad217641ef64baa99199b32d4 /environments/net-single-nic-with-vlans.yaml | |
| parent | 00e47eaf5b4d00ca59a8ce75a7f7a9a928dbf5c7 (diff) | |
Add IPv6 versions of the Controller NIC configs
This change adds Controller NIC configs for the sample NIC config
templates that are compatible with IPv6 on the External network.
These controller-v6.yaml templates include a default route for IPv6
on the External network, and a default route for IPv4 on the Control
Plane. The Heat parameters ExternalNetworkDefaultRoute and
ControlPlaneDefaultRoute are used to set these values.
Change-Id: Ifed8cb359eae1d9d623d3eb2fe40ea8a0d1d889a
Diffstat (limited to 'environments/net-single-nic-with-vlans.yaml')
| -rw-r--r-- | environments/net-single-nic-with-vlans.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/environments/net-single-nic-with-vlans.yaml b/environments/net-single-nic-with-vlans.yaml index bdfeadd3..a61bc6e1 100644 --- a/environments/net-single-nic-with-vlans.yaml +++ b/environments/net-single-nic-with-vlans.yaml @@ -12,10 +12,6 @@ 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 -# 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 |