Merge "Add Neutron DHCP agent to OVN networking setup"

ansible/roles/neutron/defaults/main.yml

@@ -71,7 +71,7 @@ neutron_services:
     container_name: "neutron_dhcp_agent"
     image: "{{ neutron_dhcp_agent_image_full }}"
     privileged: True
-    enabled: "{{ neutron_plugin_agent not in ['ovn', 'vmware_nsxv', 'vmware_nsxv3'] }}"
+    enabled: "{{ neutron_plugin_agent not in ['ovn', 'vmware_nsxv', 'vmware_nsxv3'] or neutron_ovn_dhcp_agent | bool }}"
     group: "neutron-dhcp-agent"
     host_in_groups: "{{ inventory_hostname in groups['neutron-dhcp-agent'] }}"
     volumes: "{{ neutron_dhcp_agent_default_volumes + neutron_dhcp_agent_extra_volumes }}"
@@ -730,6 +730,11 @@ notification_drivers: []
 
 neutron_notification_drivers: "{{ notification_drivers | selectattr('enabled', 'equalto', true) | list }}"
 
+######################
+# OVN
+######################
+neutron_ovn_dhcp_agent: "no"
+
 ####################
 # Kolla
 ####################

ansible/roles/neutron/templates/neutron.conf.j2

@@ -27,7 +27,7 @@ rpc_state_report_workers = {{ openstack_service_rpc_workers }}
 # in it is because we are sharing this socket in a volume which is it's own dir
 metadata_proxy_socket = /var/lib/neutron/kolla/metadata_proxy
 
-{% if neutron_plugin_agent == "openvswitch" %}
+{% if neutron_plugin_agent == "openvswitch" or (neutron_plugin_agent == "ovn" and neutron_ovn_dhcp_agent | bool) %}
 interface_driver = openvswitch
 {% elif neutron_plugin_agent == "linuxbridge" %}
 interface_driver = linuxbridge

doc/source/reference/networking/neutron.rst

@@ -80,6 +80,18 @@ To change this behaviour you need to set the following:
 
    neutron_ovn_distributed_fip: "yes"
 
+Similarly - in order to have Neutron DHCP agents deployed in OVN networking
+scenario, use:
+
+.. path /etc/kolla/globals.yml
+.. code-block:: yaml
+
+   neutron_ovn_dhcp_agent: "yes"
+
+This might be desired for example when Ironic bare metal nodes are
+used as a compute service. Currently OVN is not able to answer DHCP
+queries on port type external, this is where Neutron agent helps.
+
 Mellanox Infiniband (ml2/mlnx)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

etc/kolla/globals.yml

@@ -557,6 +557,9 @@
 # Enable distributed floating ip for OVN deployments
 #neutron_ovn_distributed_fip: "no"
 
+# Enable DHCP agent(s) to use with OVN
+#neutron_ovn_dhcp_agent: "no"
+
 #############################
 # Horizon - Dashboard Options
 #############################

releasenotes/notes/ovn-neutron-dhcp-agent-21aaafe5e1cda501.yaml

+---
+features:
+  - |
+    It is now possible to use Neutron DHCP agent together with OVN
+    networking. New variable is added to control this feature:
+    ``neutron_ovn_dhcp_agent``, defaulting to ``no``.