Merge "Remove lxb driver support"

doc/source/admin/openstack-operations/managing-networks.rst

@@ -40,7 +40,7 @@ add a new block underneath the ``provider_networks`` section:
         range: "2:4094"
         net_name: "physnet2"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
 
 The ``container_bridge`` setting defines the physical network bridge used
 to connect the veth pair from the physical host to the container.

doc/source/admin/openstack-operations/verify-deploy.rst

@@ -131,10 +131,10 @@ the OpenStack API and dashboard, as an administrator.
       | ID                                   | Agent Type           | Host                                   | Availability Zone | Alive | State | Binary                    |
       +--------------------------------------+----------------------+----------------------------------------+-------------------+-------+-------+---------------------------+
       | 262b29fe-e60e-44b0-ae3c-065565f8deb7 | Metering agent       | aio1-neutron-agents-container-2b0569d5 | None              | :-)   | UP    | neutron-metering-agent    |
-      | 41135f7f-9e6c-4122-b6b3-d131bfaae53e | Linux bridge agent   | ubuntu-focal                           | None              | :-)   | UP    | neutron-linuxbridge-agent |
+      | 41135f7f-9e6c-4122-b6b3-d131bfaae53e | Open vSwitch agent   | ubuntu-focal                           | None              | :-)   | UP    | neutron-openvswitch-agent |
       | 615d12a8-e738-490a-8552-2a03c8544b51 | Metadata agent       | aio1-neutron-agents-container-2b0569d5 | None              | :-)   | UP    | neutron-metadata-agent    |
       | 99b2abd3-a330-4ca7-b524-ed176c10b31c | DHCP agent           | aio1-neutron-agents-container-2b0569d5 | nova              | :-)   | UP    | neutron-dhcp-agent        |
-      | e0139a26-fbf7-4cee-a37f-90940dc5851f | Linux bridge agent   | aio1-neutron-agents-container-2b0569d5 | None              | :-)   | UP    | neutron-linuxbridge-agent |
+      | e0139a26-fbf7-4cee-a37f-90940dc5851f | Open vSwitch agent   | aio1-neutron-agents-container-2b0569d5 | None              | :-)   | UP    | neutron-openvswitch-agent |
       | feb20ed4-4346-4ad9-b50c-41efd784f2e9 | L3 agent             | aio1-neutron-agents-container-2b0569d5 | nova              | :-)   | UP    | neutron-l3-agent          |
       +--------------------------------------+----------------------+----------------------------------------+-------------------+-------+-------+---------------------------+
 

doc/source/admin/scale-environment.rst

@@ -174,8 +174,8 @@ To remove a compute host, follow the below procedure.
    .. code-block:: console
 
      # Run these commands on the compute node to be removed
-     # stop nova-compute
+     # systemctl stop nova-compute
-     # stop neutron-linuxbridge-agent
+     # systemctl stop neutron-openvswitch-agent
 
 #. Clone the ``openstack-ansible-ops`` repository to your deployment host:
 

doc/source/admin/troubleshooting.rst

@@ -198,11 +198,11 @@ The following table lists the commands to restart an OpenStack service.
           # service neutron-dhcp-agent restart
           # service neutron-l3-agent restart
           # service neutron-metadata-agent restart
-          # service neutron-linuxbridge-agent restart
+          # service neutron-openvswitch-agent restart
    * - Networking service (compute node)
      - .. code-block:: console
 
-          # service neutron-linuxbridge-agent restart
+          # service neutron-openvswitch-agent restart
    * - Block Storage service
      - .. code-block:: console
 
@@ -336,7 +336,7 @@ Does the instance's IP address ping from the gateway device
 
 No:
     - Check Neutron L3 agent logs (if applicable).
-    - Check Neutron linuxbridge logs.
+    - Check Neutron openvswitch logs.
     - Check physical interface mappings.
     - Check Neutron Router ports (if applicable).
     - Check that linux bridges contain the proper interfaces

doc/source/contributor/testing.rst

@@ -16,7 +16,7 @@ This folder contains at least the following files:
   by our shell script in our `tests repository`_.
 * ``inventory``. A static inventory for role testing.
   It's possible some roles have multiple inventories. See for example the
-  neutron role with its ``lxb_inventory``.
+  neutron role with its ``ovs_inventory``.
 * ``group_vars`` and ``host_vars``. These folders will hold override the
   necessary files for testing. For example, this is where you override
   the IP addresses, IP ranges, and ansible connection details.

doc/source/user/aio/quickstart.rst

@@ -234,7 +234,7 @@ container back-end.
 
 .. code-block:: shell-session
 
-   # export SCENARIO='aio_lxc_barbican_ceph_lxb'
+   # export SCENARIO='aio_lxc_barbican_ceph_ovs'
    # scripts/bootstrap-aio.sh
 
 To add any global overrides, over and above the defaults for the applicable
@@ -582,4 +582,4 @@ built for informational purposes only and should **ONLY** be used as such.
       | |          -------------------------|     | |            |      |
       | |          |                              | |            |      |
       | |          V                              | |            *      |
-      ---->[ Compute ]*[ Neutron linuxbridge ]<---| |->[ Swift storage ]-
+      ---->[ Compute ]*[ Neutron OpenvSwitch ]<---| |->[ Swift storage ]-

etc/openstack_deploy/openstack_user_config.yml.aio

@@ -56,7 +56,7 @@ global_overrides:
         range: "1:1000"
         net_name: "vxlan"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-dbaas"
         container_type: "veth"
@@ -66,7 +66,7 @@ global_overrides:
         type: "flat"
         net_name: "dbaas-mgmt"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
           - rabbitmq
     - network:
         container_bridge: "br-lbaas"
@@ -77,7 +77,7 @@ global_overrides:
         type: "flat"
         net_name: "lbaas"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
           - octavia-worker
           - octavia-housekeeping
           - octavia-health-manager
@@ -99,7 +99,7 @@ global_overrides:
         type: "flat"
         net_name: "physnet1"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-vlan"
         container_type: "veth"
@@ -108,7 +108,7 @@ global_overrides:
         range: "101:200,301:400"
         net_name: "physnet2"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-storage"
         container_type: "veth"

etc/openstack_deploy/openstack_user_config.yml.aio.j2

@@ -73,17 +73,6 @@ global_overrides:
         net_name: "vxlan"
         group_binds:
           - neutron_openvswitch_agent
-{% elif 'lxb' in bootstrap_host_scenarios_expanded %}
-    - network:
-        container_bridge: "br-vxlan"
-        container_type: "veth"
-        container_interface: "eth10"
-        ip_from_q: "tunnel"
-        type: "vxlan"
-        range: "1:1000"
-        net_name: "vxlan"
-        group_binds:
-          - neutron_linuxbridge_agent
 {% else %}
     - network:
         container_bridge: "br-vxlan"
@@ -155,27 +144,6 @@ global_overrides:
         type: "flat"
         group_binds:
           - neutron_openvswitch_agent
-{% elif 'lxb' in bootstrap_host_scenarios_expanded %}
-    - network:
-        container_bridge: "br-vlan"
-        container_type: "veth"
-        container_interface: "eth12"
-        host_bind_override: "eth12"
-        type: "flat"
-        # ensure that public network is consistently physnet1 between OVS / OVN and Linuxbridge
-        net_name: "physnet1"
-        group_binds:
-          - neutron_linuxbridge_agent
-    - network:
-        container_bridge: "br-vlan"
-        container_type: "veth"
-        container_interface: "eth11"
-        type: "vlan"
-        range: "101:200,301:400"
-        # special case for project networks - cannot re-use the physnet1 label with Linuxbridge
-        net_name: "physnet2"
-        group_binds:
-          - neutron_linuxbridge_agent
 {% else %}
     - network:
         container_bridge: "br-provider"

etc/openstack_deploy/openstack_user_config.yml.example

@@ -269,7 +269,7 @@
 #         ip_from_q: "storage"
 #     - network:
 #         group_binds:
-#           - neutron_linuxbridge_agent
+#           - neutron_openvswitch_agent
 #         container_bridge: "br-vxlan"
 #         container_type: "veth"
 #         container_interface: "eth10"
@@ -280,7 +280,7 @@
 #         net_name: "vxlan"
 #     - network:
 #         group_binds:
-#           - neutron_linuxbridge_agent
+#           - neutron_openvswitch_agent
 #         container_bridge: "br-vlan"
 #         container_type: "veth"
 #         container_interface: "eth11"
@@ -289,7 +289,7 @@
 #         net_name: "physnet1"
 #     - network:
 #         group_binds:
-#           - neutron_linuxbridge_agent
+#           - neutron_openvswitch_agent
 #         container_bridge: "br-vlan"
 #         container_type: "veth"
 #         container_interface: "eth12"

etc/openstack_deploy/openstack_user_config.yml.multibond.example

@@ -45,7 +45,7 @@ global_overrides:
         range: "1:1000"
         net_name: "vxlan"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     #
     # The below provider network define details related to a given provider
     # network: physnet1. Details include the name of the veth interface to
@@ -59,7 +59,7 @@ global_overrides:
     # The network details will be used to populate the respective network
     # configuration file(s) on the members of the listed groups. In this
     # example, host_bind_override specifies the bond1 interface and applies
-    # only to the members of the neutron_linuxbridge_agent inventory group.
+    # only to the members of the neutron_openvswitch_agent inventory group.
     #
     - network:
         container_bridge: "br-vlan"
@@ -70,7 +70,7 @@ global_overrides:
         range: "101:200,301:400"
         net_name: "physnet1"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     #
     # The below provider network defines details related to storage traffic.
     #

etc/openstack_deploy/openstack_user_config.yml.pod.example

@@ -117,7 +117,7 @@ global_overrides:
         range: "1:1000"
         net_name: "vxlan"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
         reference_group: "pod1_hosts"
         # Containers in pod1 need routes to the tunnel networks of other pods
         static_routes:
@@ -134,7 +134,7 @@ global_overrides:
         range: "1:1000"
         net_name: "vxlan"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
         reference_group: "pod2_hosts"
         # Containers in pod2 need routes to the tunnel networks of other pods
         static_routes:
@@ -151,7 +151,7 @@ global_overrides:
         range: "1:1000"
         net_name: "vxlan"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
         reference_group: "pod3_hosts"
         # Containers in pod3 need routes to the tunnel networks of other pods
         static_routes:
@@ -168,7 +168,7 @@ global_overrides:
         range: "1:1000"
         net_name: "vxlan"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
         reference_group: "pod4_hosts"
         # Containers in pod4 need routes to the tunnel networks of other pods
         static_routes:
@@ -183,7 +183,7 @@ global_overrides:
         type: "flat"
         net_name: "physnet2"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-vlan"
         container_type: "veth"
@@ -192,7 +192,7 @@ global_overrides:
         range: "101:200,301:400"
         net_name: "physnet1"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-storage"
         container_type: "veth"

etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example

@@ -41,7 +41,7 @@ global_overrides:
         range: "1:1000"
         net_name: "vxlan"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-vlan"
         container_type: "veth"
@@ -50,7 +50,7 @@ global_overrides:
         type: "flat"
         net_name: "physnet1"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-vlan"
         container_type: "veth"
@@ -59,7 +59,7 @@ global_overrides:
         range: "101:200,301:400"
         net_name: "physnet2"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-storage"
         container_type: "veth"

etc/openstack_deploy/openstack_user_config.yml.singlebond.example

@@ -45,7 +45,7 @@ global_overrides:
         range: "1:1000"
         net_name: "vxlan"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     #
     # The below provider network define details related to a given provider
     # network: physnet1. Details include the name of the veth interface to
@@ -59,7 +59,7 @@ global_overrides:
     # The network details will be used to populate the respective network
     # configuration file(s) on the members of the listed groups. In this
     # example, host_bind_override specifies the bond0 interface and applies
-    # only to the members of the neutron_linuxbridge_agent inventory group.
+    # only to the members of the neutron_openvswitch_agent inventory group.
     #
     - network:
         container_bridge: "br-vlan"
@@ -70,7 +70,7 @@ global_overrides:
         range: "101:200,301:400"
         net_name: "physnet1"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     #
     # The below provider network defines details related to storage traffic.
     #

etc/openstack_deploy/openstack_user_config.yml.test.example

@@ -36,7 +36,7 @@ global_overrides:
         range: "1:1000"
         net_name: "vxlan"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-vlan"
         container_type: "veth"
@@ -45,7 +45,7 @@ global_overrides:
         type: "flat"
         net_name: "physnet1"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-vlan"
         container_type: "veth"
@@ -54,7 +54,7 @@ global_overrides:
         range: "101:200,301:400"
         net_name: "physnet2"
         group_binds:
-          - neutron_linuxbridge_agent
+          - neutron_openvswitch_agent
     - network:
         container_bridge: "br-storage"
         container_type: "veth"

inventory/env.d/neutron.yml

@@ -23,9 +23,6 @@ component_skel:
   neutron_dhcp_agent:
     belongs_to:
       - neutron_all
-  neutron_linuxbridge_agent:
-    belongs_to:
-      - neutron_all
   neutron_openvswitch_agent:
     belongs_to:
       - neutron_all
@@ -68,7 +65,6 @@ container_skel:
       - neutron_bgp_dragent
       - neutron_dhcp_agent
       - neutron_l3_agent
-      - neutron_linuxbridge_agent
       - neutron_metadata_agent
       - neutron_metering_agent
       - neutron_openvswitch_agent

inventory/env.d/nova.yml

@@ -51,7 +51,6 @@ container_skel:
       - kvm-compute_containers
       - qemu-compute_containers
     contains:
-      - neutron_linuxbridge_agent
       - neutron_openvswitch_agent
       - neutron_sriov_nic_agent
       - neutron_ovn_controller

inventory/env.d/zun.yml

@@ -17,7 +17,6 @@ container_skel:
     belongs_to:
       - zun-compute_containers
     contains:
-      - neutron_linuxbridge_agent
       - neutron_openvswitch_agent
       - neutron_sriov_nic_agent
       - zun_compute

inventory/inventory.ini

@@ -172,7 +172,6 @@ neutron_agent
 neutron_bgp_dragent
 neutron_dhcp_agent
 neutron_l3_agent
-neutron_linuxbridge_agent
 neutron_metadata_agent
 neutron_metering_agent
 neutron_openvswitch_agent
@@ -186,7 +185,6 @@ neutron_sriov_nic_agent
 [neutron_bgp_dragent]
 [neutron_dhcp_agent]
 [neutron_l3_agent]
-[neutron_linuxbridge_agent]
 [neutron_metadata_agent]
 [neutron_metering_agent]
 [neutron_openvswitch_agent]

tests/roles/bootstrap-host/vars/main.yml

@@ -69,9 +69,7 @@ bootstrap_host_scenarios_expanded: |-
   {{ (scenario_list | unique) | sort }}
 
 _neutron_plugin_driver: |-
-  {% if 'lxb' in bootstrap_host_scenarios_expanded %}
+  {% if 'ovs' in bootstrap_host_scenarios_expanded %}
-  {%   set plugin = 'ml2.lxb' %}
-  {% elif 'ovs' in bootstrap_host_scenarios_expanded %}
   {%   set plugin = 'ml2.ovs' %}
   {% else %}
   {%   set plugin = 'ml2.ovn' %}

tests/test_inventory.py

@@ -384,7 +384,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'neutron_bgp_dragent',
         'neutron_dhcp_agent',
         'neutron_l3_agent',
-        'neutron_linuxbridge_agent',
         'neutron_metadata_agent',
         'neutron_metering_agent',
         'network-northd_containers',