Merge "Support neutron-mlnx-agent"

This commit is contained in:
Zuul 2020-09-17 22:25:10 +00:00 committed by Gerrit Code Review
commit 79426d0740
4 changed files with 9 additions and 0 deletions

View File

@ -201,6 +201,8 @@ overcloud_container_image_regex_map:
# Neutron SFC agent not currently supported on CentOS binary builds.
- regex: "neutron-\\(dhcp\\|l3\\|metadata\\|openvswitch\\)-agent"
enabled: "{{ kolla_enable_neutron | bool }}"
- regex: neutron-mlnx-agent
enabled: "{{ kolla_enable_neutron_mlnx | bool }}"
- regex: nova
enabled: "{{ kolla_enable_nova | bool }}"
- regex: octavia
@ -449,6 +451,7 @@ kolla_enable_mistral: "no"
kolla_enable_monasca: "no"
kolla_enable_multipathd: "no"
kolla_enable_murano: "no"
kolla_enable_neutron_mlnx: "no"
kolla_enable_neutron_provider_networks: "no"
kolla_enable_octavia: "no"
kolla_enable_openvswitch: "{{ kolla_enable_neutron | bool }}"

View File

@ -160,6 +160,7 @@ kolla_feature_flags:
- neutron_dvr
- neutron_infoblox_ipam_agent
- neutron_metering
- neutron_mlnx
- neutron_port_forwarding
- neutron_provider_networks
- neutron_qos

View File

@ -273,6 +273,7 @@
#kolla_enable_neutron_dvr:
#kolla_enable_neutron_infoblox_ipam_agent:
#kolla_enable_neutron_metering:
#kolla_enable_neutron_mlnx:
#kolla_enable_neutron_port_forwarding:
#kolla_enable_neutron_provider_networks:
#kolla_enable_neutron_qos:

View File

@ -0,0 +1,4 @@
---
features:
- |
Adds support for deploying the Neutron Mellanox agent.