diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-07 12:56:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-07 12:56:17 +0000 |
| commit | 98224f0b511f5387a64e1871f2142236ee1c7712 (patch) | |
| tree | 8dbb145b061a8dc880d65a9b436fd1afbd68f2a7 /environments/net-bond-with-vlans-v6.yaml | |
| parent | c97e6aa0b85d19d38144318c97a55babd260cf70 (diff) | |
| parent | 365c35cc6e1e588215ab6d63143b84bb56dce376 (diff) | |
Merge "Add IPv6 versions of the Controller NIC configs"
Diffstat (limited to 'environments/net-bond-with-vlans-v6.yaml')
| -rw-r--r-- | environments/net-bond-with-vlans-v6.yaml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/environments/net-bond-with-vlans-v6.yaml b/environments/net-bond-with-vlans-v6.yaml new file mode 100644 index 00000000..73dda3d9 --- /dev/null +++ b/environments/net-bond-with-vlans-v6.yaml @@ -0,0 +1,20 @@ +# This template configures each role to use a pair of bonded nics (nic2 and +# nic3) and configures an IP address on each relevant isolated network +# for each role, with IPv6 on the External network. This template assumes +# use of network-isolation-v6.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-v6.yaml. +resource_registry: + OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/cinder-storage.yaml + OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/bond-with-vlans/compute.yaml + OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller-v6.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 + +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: "''" |