Merge "Clarify type of auto_bridge_add"

This commit is contained in:
Jenkins 2017-10-04 04:53:37 +00:00 committed by Gerrit Code Review
commit 31c57875ab
2 changed files with 26 additions and 17 deletions

View File

@ -69,18 +69,23 @@ network:
external_bridge: br-ex external_bridge: br-ex
ip_address: 0.0.0.0 ip_address: 0.0.0.0
interface: interface:
# External interface will be automatically added to external_bridge. Default is null. # External interface will be automatically added to external_bridge.
# Tunnel interface will be used for VXLAN tunneling. Default is null, with # Tunnel interface will be used for VXLAN tunneling. If null
# fallback mechanism to search for interface with default routing. # (default) there is a fallback mechanism to search for interface
# with default routing.
external: null external: null
tunnel: null tunnel: null
# To automatically add a physical interface to a specific bridge using, # auto_bridge_add is a table of "bridge: interface" pairs, by
# for example eth3 to bridge br-physnet1 define the following key/value # default empty
# in auto_bridge_add: auto_bridge_add: {}
# br-physnet1: eth3 # To automatically add a physical interfaces to a specific bridges,
auto_bridge_add: # for example eth3 to bridge br-physnet1, if0 to br0 and iface_two
# br0: if0 # to br1 do something like:
# br1: iface_two #
# auto_bridge_add:
# br-physnet1: eth3
# br0: if0
# br1: iface_two
server: server:
port: 9696 port: 9696
ingress: ingress:

View File

@ -35,13 +35,17 @@ network:
interface: interface:
# External interface will be automatically added to external_bridge. Default is null. # External interface will be automatically added to external_bridge. Default is null.
external: null external: null
# To automatically add a physical interface to a specific bridge using, # auto_bridge_add is a table of "bridge: interface" pairs, by
# for example eth3 to bridge br-physnet1 define the following key/value # default empty
# in auto_bridge_add: auto_bridge_add: {}
# br-physnet1: eth3 # To automatically add a physical interfaces to a specific bridges,
auto_bridge_add: # for example eth3 to bridge br-physnet1, if0 to br0 and iface_two
# br0: if0 # to br1 do something like:
# br1: iface_two #
# auto_bridge_add:
# br-physnet1: eth3
# br0: if0
# br1: iface_two
pod: pod:
lifecycle: lifecycle: