Cleaning up comments.

This commit is contained in:
Joshua Harlow 2012-02-14 12:50:49 -08:00
parent 19d4e4452d
commit 352301bab8

View File

@ -113,11 +113,12 @@ fixed_network_size = ${NOVA_FIXED_NETWORK_SIZE:-256}
network_manager = ${NET_MAN:-FlatDHCPManager} network_manager = ${NET_MAN:-FlatDHCPManager}
public_interface = ${PUBLIC_INTERFACE:-eth0} public_interface = ${PUBLIC_INTERFACE:-eth0}
#DHCP Warning: If your flat interface device uses DHCP, there will be a hiccup while the network is moved from the flat interface to the flat network bridge. This will happen when you launch your first instance. Upon launch you will lose all connectivity to the node, and the vm launch will probably fail. # DHCP Warning: If your flat interface device uses DHCP, there will be a hiccup while the network
# is moved from the flat interface to the flat network bridge. This will happen when you launch
# your first instance. Upon launch you will lose all connectivity to the node, and the vm launch will probably fail.
# #
#TODO: should/can we check that FLAT_INTERFACE is sane? (in code) # 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 value as FLAT_NETWORK_BRIDGE. This will stop the network hiccup from occurring.
#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 value as FLAT_NETWORK_BRIDGE. This will stop the network hiccup from occurring.
flat_interface = ${FLAT_INTERFACE:-eth0} flat_interface = ${FLAT_INTERFACE:-eth0}
vlan_interface = ${VLAN_INTERFACE:-$(nova:public_interface)} vlan_interface = ${VLAN_INTERFACE:-$(nova:public_interface)}
flat_network_bridge = ${FLAT_NETWORK_BRIDGE:-br100} flat_network_bridge = ${FLAT_NETWORK_BRIDGE:-br100}
@ -151,7 +152,8 @@ instance_name_postfix = ${INSTANCE_NAME_POSTFIX:-%08x}
instances_path = ${INSTANCES_PATH:-} instances_path = ${INSTANCES_PATH:-}
# Are we setup in multihost mode? # Are we setup in multihost mode?
# Multi-host is a mode where each compute node runs its own network node. This allows network operations and routing for a VM to occur on the server that is running the VM - removing a SPOF and bandwidth bottleneck. # Multi-host is a mode where each compute node runs its own network node.
# This allows network operations and routing for a VM to occur on the server that is running the VM - removing a SPOF and bandwidth bottleneck.
multi_host = ${MULTI_HOST:-0} multi_host = ${MULTI_HOST:-0}
# Virtualization settings # Virtualization settings