diff --git a/doc/admin-guide-cloud/networking/section_networking_adv_features.xml b/doc/admin-guide-cloud/networking/section_networking_adv_features.xml index d38d5d22a8..4290c8e82a 100644 --- a/doc/admin-guide-cloud/networking/section_networking_adv_features.xml +++ b/doc/admin-guide-cloud/networking/section_networking_adv_features.xml @@ -580,7 +580,7 @@ To use the Compute security group API with Networking, the Networking plug-in must implement the security group API. The following plug-ins - currently implement this: ML2, Open vSwitch, Linux Bridge, NEC, Ryu, and + currently implement this: ML2, Open vSwitch, Linux Bridge, NEC, and VMware NSX. diff --git a/doc/admin-guide-cloud/networking/section_networking_config-agents.xml b/doc/admin-guide-cloud/networking/section_networking_config-agents.xml index dcaad0574b..f43b99a12d 100644 --- a/doc/admin-guide-cloud/networking/section_networking_config-agents.xml +++ b/doc/admin-guide-cloud/networking/section_networking_config-agents.xml @@ -150,58 +150,6 @@ -
- Node set up: Ryu plug-in - - - The Ryu plug-in is deprecated as of the Juno release and might be removed in Kilo - or a subsequent release. - - - If you use the Ryu plug-in, you must install Open vSwitch, Ryu, and the Ryu agent package. - - To set up each node for the Ryu - plug-in - - Install Ryu: - # pip install ryu - Currently, no Ryu package exists for - Ubuntu. - - - Install the Ryu agent and Open vSwitch - packages: - # apt-get install neutron-plugin-ryu-agent openvswitch-switch python-openvswitch openvswitch-datapath-dkms - - - Replicate the - ovs_ryu_plugin.ini - and neutron.conf - files created in the above step on all - nodes running - neutron-plugin-ryu-agent. - - - Restart Open vSwitch to properly load - the kernel module: - # service openvswitch-switch restart - - - Restart the agent: - # service neutron-plugin-ryu-agent restart - - - All nodes that run - neutron-plugin-ryu-agent - must also have an OVS bridge named - br-int on each - node. - To create the bridge, run this - command: - # ovs-vsctl add-br br-int - - -
Configure DHCP agent @@ -267,15 +215,6 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver -
-
- DHCP agent setup: Ryu plug-in - These DHCP agent options are required in the - /etc/neutron/dhcp_agent.ini - file for the Ryu plug-in: - [DEFAULT] -use_namespace = True interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
@@ -421,7 +360,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver An OVS-based plug-in such as OVS, - NSX, Ryu, NEC, + NSX, NEC, BigSwitch/Floodlight: interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver @@ -457,7 +396,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver + Floodlight, NEC, and NSX. To configure LBaas with Open vSwitch or Linux Bridge plug-in diff --git a/doc/admin-guide-cloud/networking/section_networking_config-plugins.xml b/doc/admin-guide-cloud/networking/section_networking_config-plugins.xml index 3fd878349a..ea0c196fed 100644 --- a/doc/admin-guide-cloud/networking/section_networking_config-plugins.xml +++ b/doc/admin-guide-cloud/networking/section_networking_config-plugins.xml @@ -317,64 +317,4 @@ password = "PLUMgrid-director-admin-password" -
- Configure Ryu plug-in - - - The Ryu plug-in is deprecated as of the Juno release and might be removed in Kilo or - a subsequent release. - - - - To use the Ryu plug-in with OpenStack Networking - - Install the Ryu plug-in: - # apt-get install neutron-plugin-ryu - - - Edit the /etc/neutron/neutron.conf file and set this - line: - core_plugin = ryu - - - Edit the /etc/neutron/plugins/ryu/ryu.ini file and update - these options in the [ovs] section for the ryu-neutron-agent: - - - . Defines where Ryu is listening for - REST API. Substitute and - based on your Ryu setup. - - - . Enables Ryu to access the - ovsdb-server. Substitute - eth0 based on your setup. The IP address is - derived from the interface name. If you want to change this value - irrespective of the interface name, you can specify - . If you use a non-default port for - ovsdb-server, you can specify - . - - - . Defines which IP address is used - for tunneling. If you do not use tunneling, this value is ignored. The - IP address is derived from the network interface name. - - - For database configuration, see Install Networking Services in Installation - Guide. - You can use the same configuration file for many compute nodes by using a - network interface name with a different IP address: - openflow_rest_api = IP_ADDRESS:PORT ovsdb_interface = ETH0 tunnel_interface = ETH0 - - - Restart the neutron-server to apply - the settings: - # service neutron-server restart - - -
diff --git a/doc/admin-guide-cloud/networking/section_networking_introduction.xml b/doc/admin-guide-cloud/networking/section_networking_introduction.xml index 3c483fce33..2672d59e48 100644 --- a/doc/admin-guide-cloud/networking/section_networking_introduction.xml +++ b/doc/admin-guide-cloud/networking/section_networking_introduction.xml @@ -484,12 +484,6 @@ enabled = True xlink:href="https://wiki.openstack.org/wiki/PLUMgrid-Neutron" >https://https://wiki.openstack.org/wiki/PLUMgrid-Neutron - - Ryu - This guide and https://github.com/osrg/ryu/wiki/OpenStack - VMware NSX @@ -638,14 +632,6 @@ enabled = True - - Ryu - Yes - - - - - VMware NSX Yes diff --git a/doc/common/section_getstart_networking.xml b/doc/common/section_getstart_networking.xml index 91de169bc2..c640dc47c5 100644 --- a/doc/common/section_getstart_networking.xml +++ b/doc/common/section_getstart_networking.xml @@ -24,8 +24,7 @@ depending on the vendor and technologies used in the particular cloud. OpenStack Networking ships with plug-ins and agents for Cisco virtual and physical switches, NEC OpenFlow products, Open - vSwitch, Linux bridging, Ryu Network Operating System, and - the VMware NSX product. + vSwitch, Linux bridging, and the VMware NSX product. The common agents are L3 (layer 3), DHCP (dynamic host IP addressing), and a plug-in agent.
diff --git a/doc/common/tables/neutron-ryu.xml b/doc/common/tables/neutron-ryu.xml deleted file mode 100644 index 4906da0500..0000000000 --- a/doc/common/tables/neutron-ryu.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of RYU configuration options
Configuration option = Default valueDescription
[DEFAULT]
wsapi_host = (StrOpt) webapp listen host
wsapi_port = 8080(IntOpt) webapp listen port
[OVS]
openflow_rest_api = 127.0.0.1:8080(StrOpt) OpenFlow REST API location.
ovsdb_interface = None(StrOpt) OVSDB interface to connect to.
ovsdb_ip = None(StrOpt) OVSDB IP to connect to.
ovsdb_port = 6634(IntOpt) OVSDB port to connect to.
tunnel_interface = None(StrOpt) Tunnel interface to use.
tunnel_ip = None(StrOpt) Tunnel IP to use.
tunnel_key_max = 16777215(IntOpt) Maximum tunnel ID to use.
tunnel_key_min = 1(IntOpt) Minimum tunnel ID to use.
-
diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml index ac0d08b2e2..49b4b70bd1 100644 --- a/doc/config-reference/networking/section_networking-plugins.xml +++ b/doc/config-reference/networking/section_networking-plugins.xml @@ -15,6 +15,10 @@ L2-in-L3 tunneling or OpenFlow. These sections detail the configuration options for the various plug-ins. + Ryu plugin has been removed in Kilo. Ryu team recommends + to migrate to ML2 plugin with ofagent mechanism driver. + However, it isn't a functionality equivalent. + No mechanical upgrade procedure is provided.
BigSwitch configuration options
-
- Ryu configuration options - -
SR-IOV configuration options - - - Ryu neutron plug-in - - Ryu neutron plug-in - - - - Enables the Ryu network operating system to function as a - Networking OpenFlow controller. - - diff --git a/doc/networking-guide/section_networking_adv_features.xml b/doc/networking-guide/section_networking_adv_features.xml index 24d906a6f0..5f27dd2292 100644 --- a/doc/networking-guide/section_networking_adv_features.xml +++ b/doc/networking-guide/section_networking_adv_features.xml @@ -582,7 +582,7 @@ To use the Compute security group API with Networking, the Networking plug-in must implement the security group API. The following plug-ins - currently implement this: ML2, Open vSwitch, Linux Bridge, NEC, Ryu, and + currently implement this: ML2, Open vSwitch, Linux Bridge, NEC, and VMware NSX.