openstack/openstack-ansible-os_octavia
Code Issues Proposed changes

Merge "Define ovn provider agent when OVN is used"

Browse Source
This commit is contained in:
Zuul 2024-08-29 15:16:58 +00:00 committed by Gerrit Code Review
commit 689aa04a20
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -490,7 +490,9 @@ octavia_uwsgi_tls:
# Set up the drivers # Set up the drivers
# Provider agents are optional and not required for a successful Octavia provider driver # Provider agents are optional and not required for a successful Octavia provider driver
# Possible options: amphora_agent, noop_agent, ovn # Possible options: amphora_agent, noop_agent, ovn
octavia_enabled_provider_agents: [] octavia_enabled_provider_agents:
- "{{ (octavia_ovn_enabled | bool) | ternary('ovn', None) }}"
octavia_enabled_provider_drivers: octavia_enabled_provider_drivers:
- "amphorav2:'The Octavia Amphora v2 driver.'" - "amphorav2:'The Octavia Amphora v2 driver.'"
- "{{ (octavia_ovn_enabled | bool) | ternary(\"ovn:'The Octavia OVN provider driver.'\", False) }}" - "{{ (octavia_ovn_enabled | bool) | ternary(\"ovn:'The Octavia OVN provider driver.'\", False) }}"

5
templates/octavia.conf.j2
View File

@ -199,9 +199,10 @@ endpoint_type = {{ octavia_clients_endpoint }}
region_name = {{ keystone_service_region }} region_name = {{ keystone_service_region }}
valid_interfaces = {{ octavia_clients_endpoint }} valid_interfaces = {{ octavia_clients_endpoint }}
{% if octavia_enabled_provider_agents | length > 0 %} {% set _enabled_provider_agents = octavia_enabled_provider_agents | select() %}
{% if _enabled_provider_agents | length > 0 %}
[driver_agent] [driver_agent]
enabled_provider_agents = {{ octavia_enabled_provider_agents | join(',') }} enabled_provider_agents = {{ _enabled_provider_agents | join(',') }}
{% endif %} {% endif %}
{% if octavia_ovn_enabled %} {% if octavia_ovn_enabled %}