Fix stevedore aliases for Neutron DHCP Agents

In patch https://review.openstack.org/#/c/234991/ Neutron moved to using
stevedore aliases in favour of class imports. The class imports still
technically work, but generate log warnings.

This patch adjusts references to the class imports for the
OVSInterfaceDriver and BridgeInterfaceDriver within the admin and
install guides.

Additionally, this patch adds the Linuxbridge section to the "Configure
DHCP agent" stanza within the admin-guide.

Change-Id: Ie103dd1a4529ef22a96d90821af6aa009b441675

doc/admin-guide/source/networking-adv-config.rst

@@ -28,14 +28,12 @@ service. The driver adds metering to the routing interface.
 | **Open vSwitch**                         |                                 |
 +------------------------------------------+---------------------------------+
 | interface\_driver                        |                                 |
-| ($NEUTRON\_CONF\_DIR/metering\_agent.ini)| neutron.agent.linux.interface.  |
-|                                          | OVSInterfaceDriver              |
+| ($NEUTRON\_CONF\_DIR/metering\_agent.ini)| openvswitch                     |
 +------------------------------------------+---------------------------------+
 | **Linux Bridge**                         |                                 |
 +------------------------------------------+---------------------------------+
 | interface\_driver                        |                                 |
-| ($NEUTRON\_CONF\_DIR/metering\_agent.ini)| neutron.agent.linux.interface.  |
-|                                          | BridgeInterfaceDriver           |
+| ($NEUTRON\_CONF\_DIR/metering\_agent.ini)| linuxbridge                     |
 +------------------------------------------+---------------------------------+
 
 L3 metering driver

doc/admin-guide/source/networking-config-agents.rst

@@ -135,7 +135,7 @@ These DHCP agent options are required in the
 
    [DEFAULT]
    enable_isolated_metadata = True
-   interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+   interface_driver = openvswitch
 
 DHCP agent setup: NSX plug-in
 -----------------------------
@@ -148,7 +148,19 @@ These DHCP agent options are required in the
    [DEFAULT]
    enable_metadata_network = True
    enable_isolated_metadata = True
-   interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+   interface_driver = openvswitch
+
+DHCP agent setup: Linux-bridge plug-in
+--------------------------------------
+
+These DHCP agent options are required in the
+``/etc/neutron/dhcp_agent.ini`` file for the Linux-bridge plug-in:
+
+.. code-block:: bash
+
+   [DEFAULT]
+   enabled_isolated_metadata = True
+   interface_driver = linuxbridge
 
 Configure L3 agent
 ~~~~~~~~~~~~~~~~~~
@@ -304,14 +316,13 @@ The Neutron Metering agent resides beside neutron-l3-agent.
 
       .. code-block:: ini
 
-         interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+         interface_driver = openvswitch
 
    -  A plug-in that uses LinuxBridge:
 
       .. code-block:: ini
 
-         interface_driver = neutron.agent.linux.interface.
-         BridgeInterfaceDriver
+         interface_driver = linuxbridge
 
 #. To use the reference implementation, you must set:
 

doc/install-guide-debconf/source/neutron-controller-install-option1.rst

@@ -183,7 +183,7 @@ The :term:`DHCP agent` provides DHCP services for virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
        dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
        enable_isolated_metadata = True
 

doc/install-guide-debconf/source/neutron-controller-install-option2.rst

@@ -172,7 +172,7 @@ self-service virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
        external_network_bridge =
 
     .. note::
@@ -196,7 +196,7 @@ The :term:`DHCP agent` provides DHCP services for virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
        dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
        enable_isolated_metadata = True
 

doc/install-guide/source/neutron-controller-install-option1.rst

@@ -322,7 +322,7 @@ The :term:`DHCP agent` provides DHCP services for virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
        dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
        enable_isolated_metadata = True
 

doc/install-guide/source/neutron-controller-install-option2.rst

@@ -353,7 +353,7 @@ self-service virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
 
     .. end
 
@@ -374,7 +374,7 @@ The :term:`DHCP agent` provides DHCP services for virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
        dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
        enable_isolated_metadata = True