summaryrefslogtreecommitdiffstats
path: root/environments/docker-network.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-05 13:10:26 +0000
committerGerrit Code Review <review@openstack.org>2016-01-05 13:10:26 +0000
commita491e05f9d6229f185570d1b4a07794546102515 (patch)
tree9e653ea24b193dcfeb0906e000944085b4241d83 /environments/docker-network.yaml
parentc7878be6b40ef7680616c2378589df1225caa4b6 (diff)
parentdb16fd6b59257ea9eacbf071e9e799041822dcab (diff)
Merge "Network Isolation support for containerized compute"
Diffstat (limited to 'environments/docker-network.yaml')
-rw-r--r--environments/docker-network.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/docker-network.yaml b/environments/docker-network.yaml
new file mode 100644
index 00000000..f10ec389
--- /dev/null
+++ b/environments/docker-network.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+ OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml