summaryrefslogtreecommitdiffstats
path: root/build/upstream-environment.yaml
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-20 00:24:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-20 00:24:47 +0000
commit82a9bec67b094f6381acb035a9efeffe47b011ab (patch)
treeeb300e2d526b919f2eb0953e3a4a61cf285d4496 /build/upstream-environment.yaml
parent48d1c6885afe72c92d07204cdfc97829ce9d24ed (diff)
parent8bc7bd15dcb170f3c37dfe0358dcdf7f9189b2ba (diff)
Merge "Add tenant vlan support"
Diffstat (limited to 'build/upstream-environment.yaml')
-rw-r--r--build/upstream-environment.yaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/build/upstream-environment.yaml b/build/upstream-environment.yaml
index debe6f3a..2d037c38 100644
--- a/build/upstream-environment.yaml
+++ b/build/upstream-environment.yaml
@@ -7,7 +7,10 @@ parameters:
parameter_defaults:
DockerPuppetProcessCount: 10
- NeutronNetworkVLANRanges: 'datacentre:500:525'
+ #NeutronNetworkVLANRanges: 'datacentre:500:525'
+ #NeutronBridgeMappings: "datacentre:br-ex"
+ #OpenDaylightProviderMappings: "datacentre:br-ex"
+ NeutronNetworkType: vxlan
SshServerOptions:
HostKey:
- '/etc/ssh/ssh_host_rsa_key'