From 33d18adfd2f83cdf4efa449185d2c326a5d6d170 Mon Sep 17 00:00:00 2001 From: Assaf Muller Date: Mon, 29 Jun 2015 13:44:57 -0400 Subject: [PATCH] Remove unnecessary ML2 conf from compute/network nodes Change-Id: I08e726dcba6b6f068d7783bc8e80be4988b11a95 Partial-Bug: #1469814 --- .../source/deploy_scenario3a.rst | 73 +------------------ .../source/deploy_scenario3b.rst | 73 ++----------------- 2 files changed, 9 insertions(+), 137 deletions(-) diff --git a/doc/networking-guide/source/deploy_scenario3a.rst b/doc/networking-guide/source/deploy_scenario3a.rst index 72fc3c6495..62d6ad63f1 100644 --- a/doc/networking-guide/source/deploy_scenario3a.rst +++ b/doc/networking-guide/source/deploy_scenario3a.rst @@ -297,40 +297,13 @@ instances. [DEFAULT] verbose = True - core_plugin = ml2 - service_plugins = router allow_overlapping_ips = True - dhcp_agents_per_network = 2 - - l3_ha = True - max_l3_agents_per_router = 3 - min_l3_agents_per_router = 2 - l3_ha_net_cidr = 169.254.192.0/18 - -#. Configure the ML2 plug-in. Edit the +#. Configure the OVS agent. Edit the :file:`/etc/neutron/plugins/ml2/ml2_conf.ini` file: :: - [ml2] - type_drivers = flat,vlan,gre,vxlan - tenant_network_types = vlan,gre,vxlan - mechanism_drivers = openvswitch - - [ml2_type_flat] - flat_networks = external - - [ml2_type_vlan] - network_vlan_ranges = vlan:MIN_VLAN_ID:MAX_VLAN_ID - - [ml2_type_gre] - tunnel_id_ranges = MIN_GRE_SESSION:MAX_GRE_SESSION - - [ml2_type_vxlan] - vni_ranges = MIN_VNI:MAX_VNI - vxlan_group = 239.1.1.1 - [securitygroup] enable_security_group = True enable_ipset = True @@ -344,17 +317,7 @@ instances. tunnel_types = gre,vxlan Replace ``TENANT_TUNNEL_INTERFACE_IP_ADDRESS`` with the IP address - of the tenant tunnel network interface. Replace ``MIN_VLAN_ID`` and - ``MAX_VLAN_ID`` with the VLAN ID range available for tenant networks. - Replace ``MIN_GRE_SESSION`` and ``MAX_GRE_SESSION`` with a suitable GRE - tunnel session range. Replace ``MIN_VNI`` and ``MAX_VNI`` with a suitable - VXLAN network ID range. - - .. note:: - - The first value in the 'tenant_network_types' option becomes the - default tenant network type when a non-privileged user creates a - network. + of the tenant tunnel network interface #. Configure the L3 agent. Edit the :file:`/etc/neutron/l3_agent.ini` file: @@ -441,30 +404,12 @@ for instances. [DEFAULT] verbose = True - core_plugin = ml2 - service_plugins = router - allow_overlapping_ips = True -#. Configure the ML2 plug-in. Edit the +#. Configure the OVS agent. Edit the :file:`/etc/neutron/plugins/ml2/ml2_conf.ini` file: :: - [ml2] - type_drivers = flat,vlan,gre,vxlan - tenant_network_types = vlan,gre,vxlan - mechanism_drivers = openvswitch - - [ml2_type_vlan] - network_vlan_ranges = vlan:MIN_VLAN_ID:MAX_VLAN_ID - - [ml2_type_gre] - tunnel_id_ranges = MIN_GRE_SESSION:MAX_GRE_SESSION - - [ml2_type_vxlan] - vni_ranges = MIN_VNI:MAX_VNI - vxlan_group = 239.1.1.1 - [securitygroup] enable_security_group = True enable_ipset = True @@ -478,17 +423,7 @@ for instances. tunnel_types = gre,vxlan Replace ``TENANT_TUNNEL_INTERFACE_IP_ADDRESS`` with the IP address - of the tenant tunnel network interface. Replace ``MIN_VLAN_ID`` and - ``MAX_VLAN_ID`` with the VLAN ID range available for tenant networks. - Replace ``MIN_GRE_SESSION`` and ``MAX_GRE_SESSION`` with a suitable GRE - tunnel session range. Replace ``MIN_VNI`` and ``MAX_VNI`` with a suitable - VXLAN network ID range. - - .. note:: - - The first value in the 'tenant_network_types' option becomes the - default tenant network type when a non-privileged user creates a - network. + of the tenant tunnel network interface. #. Start the following services: diff --git a/doc/networking-guide/source/deploy_scenario3b.rst b/doc/networking-guide/source/deploy_scenario3b.rst index 19960b9f77..f2012689d0 100644 --- a/doc/networking-guide/source/deploy_scenario3b.rst +++ b/doc/networking-guide/source/deploy_scenario3b.rst @@ -74,8 +74,8 @@ OpenStack services - network node #. Operational OpenStack Identity service with appropriate configuration in the :file:`neutron-server.conf` file. -#. Open vSwitch service, ML2 plug-in, Linux bridge agent, L3 agent, - DHCP agent, metadata agent, and any dependencies. +#. ML2 plug-in, Linux bridge agent, L3 agent, DHCP agent, metadata agent, + and any dependencies. OpenStack services - compute nodes ---------------------------------- @@ -86,8 +86,7 @@ OpenStack services - compute nodes #. Operational OpenStack Compute hypervisor service with appropriate configuration to use neutron in the :file:`nova.conf` file. -#. Open vSwitch service, ML2 plug-in, Linux bridge agent, and any - dependencies. +#. ML2 plug-in, Linux bridge agent, and any dependencies. Architecture ~~~~~~~~~~~~ @@ -271,33 +270,11 @@ Network nodes [DEFAULT] verbose = True - core_plugin = ml2 - service_plugins = router allow_overlapping_ips = True - dhcp_agents_per_network = 2 - router_distributed = False - l3_ha = True - max_l3_agents_per_router = 3 - min_l3_agents_per_router = 2 -#. Configure the ML2 plug-in. Edit the +#. Configure the Linux Bridge agent. Edit the :file:`/etc/neutron/plugins/ml2/ml2_conf.ini` file:: - [ml2] - type_drivers = flat,vlan,vxlan - tenant_network_types = vxlan,vlan - mechanism_drivers = linuxbridge - - [ml2_type_flat] - flat_networks = external - - [ml2_type_vlan] - network_vlan_ranges = vlan:1001:2000 - - [ml2_type_vxlan] - vni_ranges = 1001:2000 - vxlan_group = 239.1.1.1 - [securitygroup] enable_security_group = True enable_ipset = True @@ -306,16 +283,10 @@ Network nodes [linux_bridge] physical_interface_mappings = vxlan:PROJECT_TUNNEL_NETWORK_INTERFACE,vlan:PROJECT_VLAN_NETWORK_INTERFACE,external:EXTERNAL_NETWORK_INTERFACE - [vlans] - tenant_network_type = vlan - network_vlan_ranges = vlan:1001:2000 - [vxlan] enable_vxlan = True local_ip = PROJECT_NETWORK_TUNNELS_INTERFACE_IP_ADDRESS - Adjust the VLAN tag and VXLAN tunnel ID ranges for your environment. - Replace ``PROJECT_TUNNEL_NETWORK_INTERFACE``, ``PROJECT_VLAN_NETWORK_INTERFACE``, and ``EXTERNAL_NETWORK_INTERFACE`` with the respective underlying network interface names. For example, @@ -324,10 +295,6 @@ Network nodes Replace ``PROJECT_NETWORK_TUNNELS_INTERFACE_IP_ADDRESS`` with the IP address of the project network tunnels interface. - .. note:: - The first value in the ``tenant_network_types`` option becomes the - default project network type when a non-privileged user creates a network. - #. Configure the L3 agent. Edit the :file:`/etc/neutron/l3_agent.ini` file:: [DEFAULT] @@ -402,30 +369,10 @@ Compute nodes [DEFAULT] verbose = True - core_plugin = ml2 - service_plugins = router - allow_overlapping_ips = True - dhcp_agents_per_network = 2 - router_distributed = False - l3_ha = True - max_l3_agents_per_router = 3 - min_l3_agents_per_router = 2 -#. Configure the ML2 plug-in. Edit the +#. Configure the Linux Bridge agent. Edit the :file:`/etc/neutron/plugins/ml2/ml2_conf.ini` file:: - [ml2] - type_drivers = flat,vlan,vxlan - tenant_network_types = vxlan,vlan - mechanism_drivers = linuxbridge - - [ml2_type_vlan] - network_vlan_ranges = vlan:1001:2000 - - [ml2_type_vxlan] - vni_ranges = 1001:2000 - vxlan_group = 239.1.1.1 - [securitygroup] enable_security_group = True enable_ipset = True @@ -434,16 +381,10 @@ Compute nodes [linux_bridge] physical_interface_mappings = vxlan:PROJECT_TUNNEL_NETWORK_INTERFACE,vlan:PROJECT_VLAN_NETWORK_INTERFACE - [vlans] - tenant_network_type = vlan - network_vlan_ranges = vlan:1001:2000 - [vxlan] enable_vxlan = True local_ip = PROJECT_NETWORK_TUNNELS_INTERFACE_IP_ADDRESS - Adjust the VLAN tag and VXLAN tunnel ID ranges for your environment. - Replace ``PROJECT_TUNNEL_NETWORK_INTERFACE`` and ``PROJECT_VLAN_NETWORK_INTERFACE`` with the respective underlying network interface names. For example, ``eth1``, ``eth2``, and ``eth3``. @@ -451,10 +392,6 @@ Compute nodes Replace ``PROJECT_NETWORK_TUNNELS_INTERFACE_IP_ADDRESS`` with the IP address of the project network tunnels interface. - .. note:: - The first value in the ``tenant_network_types`` option becomes the - default project network type when a non-privileged user creates a network. - #. Start the following services: * Linux bridge agent