Revert "Updates scenario files for hunter branch"

[apex.git] / config / network / network_settings.yaml

diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml
index fe11a9b..fee6b50 100644 (file)
--- a/config/network/network_settings.yaml
+++ b/config/network/network_settings.yaml
@@ -57,6 +57,10 @@ syslog:
   server: 10.128.1.24
   transport: 'tcp'
 
+# http(s) proxy settings added to /etc/environment of uc and oc nodes
+# http_proxy: http://proxy.server:8080
+# https_proxy: https://proxy.server:8081
+
 # Common network settings
 networks:
   # Admin configuration (pxe and jumpstart)
@@ -112,6 +116,12 @@ networks:
     mtu: 1500
     # Tenant network Overlay segmentation ID range:
     # VNI, VLAN-ID, etc.
+    # VLAN config should follow the pattern of neutron ml2 network_vlan_ranges
+    # allowed patterns are <physical_network> or
+    # <physical_network>:<vlan_min>:<vlan_max>
+    # Note that for VLAN config, physnet 'datacentre:1:1000' is used for
+    # external networks by default and will be automatically added to
+    # Neutron config if the range specified here does not include datacentre.
     overlay_id_range: 2,65535
 
     # Tenant network segmentation type:
@@ -176,8 +186,11 @@ networks:
       nic_mapping:
         # Mapping for compute profile (nodes assigned as Compute nodes)
         compute:
-          # Physical interface type (interface or bond)
-          phys_type: interface
+          # Physical interface type (ovs_bridge, interface or bond)
+          # Note that this phys_type for external network will be changed
+          # to vpp_interface for odl_fdio scenarios and linux_bridge for
+          # nosdn_fdio scenarios.
+          phys_type: ovs_bridge
           # VLAN tag to use with this NIC
           vlan: native
           # Physical NIC members of this mapping
@@ -186,7 +199,10 @@ networks:
             - eth2
         # Mapping for controller profile (nodes assigned as Controller nodes)
         controller:
-          phys_type: interface
+          # Note that this phys_type for external network will be changed
+          # to vpp_interface for odl_fdio scenarios and linux_bridge for
+          # nosdn_fdio scenarios.
+          phys_type: ovs_bridge
           vlan: native
           members:
             - eth2