Merge "Add support for the Ironic Neutron agent"

ansible/group_vars/all/kolla

@@ -146,6 +146,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_influxdb | bool }}"
   - regex: ironic
     enabled: "{{ kolla_enable_ironic | bool }}"
+  - regex: ironic-neutron-agent
+    enabled: "{{ kolla_enable_ironic_neutron_agent | bool }}"
   - regex: iscsid
     enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}"
   - regex: kafka
@@ -317,6 +319,7 @@ kolla_enable_horizon: "yes"
 kolla_enable_influxdb: "no"
 kolla_enable_ironic: "yes"
 kolla_enable_ironic_ipxe: "no"
+kolla_enable_ironic_neutron_agent: "{{ 'yes' if kolla_enable_neutron | bool and kolla_enable_ironic | bool else 'no' }}"
 kolla_enable_kafka: "no"
 kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool else 'no' }}"
 kolla_enable_magnum: "no"

ansible/roles/kolla-ansible/templates/overcloud-services.j2

@@ -73,6 +73,9 @@ neutron
 [neutron-bgp-dragent:children]
 neutron
 
+[ironic-neutron-agent:children]
+neutron
+
 # Ceph
 [ceph-mds:children]
 ceph

ansible/roles/kolla-ansible/tests/test-defaults.yml

@@ -117,6 +117,7 @@
               - neutron_tenant_network_types
               - enable_glance
               - enable_ironic
+              - enable_ironic_neutron_agent
               - enable_kafka
               - enable_influxdb
               - enable_mariadb

ansible/roles/kolla-ansible/tests/test-extras.yml

@@ -86,6 +86,7 @@
             kolla_enable_horizon: True
             kolla_enable_influxdb: True
             kolla_enable_ironic: True
+            kolla_enable_ironic_neutron_agent: True
             kolla_enable_kafka: True
             kolla_enable_karbor: True
             kolla_enable_kibana: True
@@ -222,6 +223,7 @@
               #enable_horizon: True
               #enable_influxdb: True
               #enable_ironic: True
+              #enable_ironic_neutron_agent: True
               #enable_kafka: True
               #enable_karbor: True
               #enable_kibana: True

ansible/roles/kolla-ansible/vars/main.yml

@@ -88,6 +88,7 @@ kolla_feature_flags:
   - influxdb
   - ironic
   - ironic_ipxe
+  - ironic_neutron_agent
   - ironic_pxe_uefi
   - kafka
   - karbor

releasenotes/notes/support_ironic_neutron_agent-a41e44ef41f5a96d.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - Support configuration of the Ironic Neutron Agent and Neutron ML2 baremetal
+    plugin.