Merge branch 'dev-mtsugawa-euca-12584'

tools/eucalyptus.conf

@@ -66,7 +66,7 @@ NODES=""
 # broadcast domain or running single cluster.  Change this setting
 # to "N" to enable tunneling when you have separate layer 2 broadcast
 # domains in separate clusters. 
-# This setting has no effect in Edge mode.
+# This setting has no effect in EDGE and VPCMIDO modes.
 DISABLE_TUNNELING="Y"
 
 # The location of the NC service.  The default is
@@ -183,38 +183,40 @@ INSTANCE_PATH="/var/lib/eucalyptus/instances"
 
 # The networking mode in which to run.  The same mode must be specified
 # on all CCs and NCs in the entire cloud.  Valid values include EDGE,
-# MANAGED, and MANAGED-NOVLAN.
-VNET_MODE="MANAGED-NOVLAN"
+# VPCMIDO, MANAGED, and MANAGED-NOVLAN. Note that MANAGED and MANAGED-NOVLAN
+# modes are deprecated as of 4.3.0.
+#VNET_MODE="EDGE"
 
 # The name of the network interface that is on the same network as
 # the NCs. The default is "eth0".
-# Networking modes: Managed, Managed (No VLAN)
+# Networking modes: MANAGED, MANAGED-NOVLAN
 VNET_PRIVINTERFACE="eth0"
 
 # On a CC, this is the name of the network interface that is connected
 # to the "public" network.  When tunnelling is enabled, this must be
 # a bridge.  The default is "eth0".
-# Networking modes: Managed, Managed (No VLAN)
+# Networking modes: MANAGED, MANAGED-NOVLAN
 #
 # On an NC, this is the name of the network interface that is connected
 # to the same network as the CC.  The default is "eth0".
-# Networking modes: Edge, Managed
+# Networking modes: EDGE, MANAGED
 VNET_PUBINTERFACE="eth0"
 
 # On an NC, this is the name of the bridge interface to which instances'
 # network interfaces should attach.  A physical interface that can reach
-# the CC must be attached to this bridge.
-# Networking modes: Edge, Managed (No VLAN)
+# the CC must be attached to this bridge (in VPCMIDO mode there is no
+# need to attach this physical interface).
+# Networking modes: EDGE, VPCMIDO, MANAGED-NOVLAN
 VNET_BRIDGE="br0"
 
 # A space-separated list of individual and/or hyphenated ranges of public
 # IP addresses to assign to instances.
-# Networking modes: Managed, Managed (No VLAN)
+# Networking modes: MANAGED, MANAGED-NOVLAN
 #VNET_PUBLICIPS="your-free-public-ip-1 your-free-public-ip-2 ..."
 
 # The address and network mask of the network the cloud should use for
 # instances' private IP addresses.
-# Networking modes: Managed, Managed (No VLAN)
+# Networking modes: MANAGED, MANAGED-NOVLAN
 #VNET_SUBNET="192.168.0.0"
 #VNET_NETMASK="255.255.0.0"
 
@@ -223,33 +225,33 @@ VNET_BRIDGE="br0"
 # will reserve 11 IPs from each security group for internal system
 # use, leaving VNET_ADDRSPERNET-11 IPs free for VMs to use for each
 # security group.
-# Networking modes: Managed, Managed (No VLAN)
+# Networking modes: MANAGED, MANAGED-NOVLAN
 #VNET_ADDRSPERNET="32"
 
 # The address of the DNS server to supply to instances in DHCP responses.
-# Networking modes: Managed, Managed (No VLAN). Moving forward, 
+# Networking modes: MANAGED, MANAGED-NOVLAN. Moving forward, 
 # this option will be deprecated in favor of the CLC property.
 #VNET_DNS="your-dns-server-ip"
 
 # The search domain to supply to instance in DHCP responses.
 # NOTE: This should always be cloud.vmstate.instance_subdomain + ".internal",
 # and will be overridden by the CLC property. Moving forward, this option will
 # be deprecated in favor of the CLC property.
-# Networking modes: Managed, Managed (No VLAN)
+# Networking modes: MANAGED, MANAGED-NOVLAN
 #VNET_DOMAINNAME="eucalyptus.internal"
 
 # Set this to the IP address that other CCs can use to reach this CC
 # if layer 2 tunneling between CCs does not work.  It is not normally
 # necessary to change this setting.
-# Networking modes: Managed, Managed (No VLAN)
+# Networking modes: MANAGED, MANAGED-NOVLAN
 #VNET_LOCALIP="your-public-interface's-ip"
 
 # The ISC DHCP server executable to use.  The default is
 # "/usr/sbin/dhcpd".
-# Networking modes: Edge, Managed, Managed (No VLAN)
+# Networking modes: EDGE, MANAGED, MANAGED-NOVLAN
 VNET_DHCPDAEMON="/usr/sbin/dhcpd"
 
 # The user as which the DHCP daemon runs on your distribution.
 # The default is "dhcpd".
-# Networking modes: Edge, Managed, Managed (No VLAN)
+# Networking modes: EDGE, MANAGED, MANAGED-NOVLAN
 #VNET_DHCPUSER="dhcpd"