summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-26 22:04:48 +0000
committerGerrit Code Review <review@openstack.org>2015-05-26 22:04:48 +0000
commitc46e671d878533c010a609ef6dbcd4c2b4c18f51 (patch)
treede63a05625e5f5015ba4044c79c4efe30ce14e9c /environments
parent8bdb82deb9423d1f7de2b479f97f92fb66ab3c81 (diff)
parentb982219b65e350b41c13e4e80a9fc154869c4128 (diff)
Merge "os-net-config templates to configure vlans on bond"
Diffstat (limited to 'environments')
-rw-r--r--environments/net-bond-with-vlans.yaml13
1 files changed, 13 insertions, 0 deletions
diff --git a/environments/net-bond-with-vlans.yaml b/environments/net-bond-with-vlans.yaml
new file mode 100644
index 00000000..38c31cac
--- /dev/null
+++ b/environments/net-bond-with-vlans.yaml
@@ -0,0 +1,13 @@
+# 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. 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/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.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