Merge "Allow empty FLAT_INTERFACE for local-only access"

This commit is contained in:
Jenkins 2012-09-09 19:34:49 +00:00 committed by Gerrit Code Review
commit c132625d1d

View File

@ -447,10 +447,9 @@ MULTI_HOST=`trueorfalse False $MULTI_HOST`
# fail. # fail.
# #
# If you are running on a single node and don't need to access the VMs from # If you are running on a single node and don't need to access the VMs from
# devices other than that node, you can set the flat interface to the same # devices other than that node, you can set FLAT_INTERFACE=
# value as ``FLAT_NETWORK_BRIDGE``. This will stop the network hiccup from # This will stop nova from bridging any interfaces into FLAT_NETWORK_BRIDGE.
# occurring. FLAT_INTERFACE=${FLAT_INTERFACE-$GUEST_INTERFACE_DEFAULT}
FLAT_INTERFACE=${FLAT_INTERFACE:-$GUEST_INTERFACE_DEFAULT}
## FIXME(ja): should/can we check that FLAT_INTERFACE is sane? ## FIXME(ja): should/can we check that FLAT_INTERFACE is sane?