Switch default provider to amphorav2

Amphorav1 has been deprecated and is removed early at the
beginning of the 2023.2 cycle. With that Antelope is perfect time for
switching the default.

[1] 6c0515c988

Change-Id: I133f20a6d971832138708101e6a8380d23e75cf2
This commit is contained in:
Dmitriy Rabotyagov 2023-04-24 16:16:20 +02:00
parent cea4f2e358
commit 8499e1713e
4 changed files with 11 additions and 10 deletions

View File

@ -434,8 +434,11 @@ octavia_uwsgi_bind_address: "{{ openstack_service_bind_address | default('0.0.0.
octavia_api_uwsgi_ini_overrides: {}
# Set up the drivers
octavia_enabled_provider_drivers: "{{ _octavia_enabled_provider_drivers }}"
octavia_default_provider_driver: "{{ (octavia_coordination_enable | bool) | ternary('amphorav2', 'amphora') }}"
octavia_enabled_provider_drivers:
- "amphora:'The Octavia Amphora driver.'"
- "amphorav2:'The Octavia Amphora v2 driver.'"
- "octavia:'Deprecated name of Amphora driver.'"
octavia_default_provider_driver: "amphorav2"
octavia_amphora_driver: amphora_haproxy_rest_driver
octavia_compute_driver: compute_nova_driver
octavia_network_driver: allowed_address_pairs_driver

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Default provider driver for Octavia has been changed to ``amphorav2``, since
`amphora` and `octavia` drivers are deprecated for removal.

View File

@ -16,7 +16,7 @@ auth_strategy = {{ octavia_auth_strategy }}
allow_tls_terminated_listeners = {{ octavia_tls_listener_enabled }}
default_provider_driver = {{ octavia_default_provider_driver }}
enabled_provider_drivers = {{ octavia_enabled_provider_drivers }}
enabled_provider_drivers = {{ octavia_enabled_provider_drivers | join(',') }}
[oslo_messaging]
topic = octavia_prov

View File

@ -77,10 +77,3 @@ _octavia_legacy_policies:
_octavia_jobboard_driver_map:
zookeeper: zookeeper_taskflow_driver
redis: redis_taskflow_driver
_octavia_enabled_provider_drivers: |-
{% set drivers = ["amphora:'The Octavia Amphora driver.'", "octavia:'Deprecated name of Amphora driver.'"] %}
{% if (octavia_coordination_enable | bool) %}
{% set _ = drivers.append("amphorav2:'The Octavia Amphora v2 driver.'") %}
{% endif %}
{{ drivers | join(',') }}