diff --git a/defaults/main.yml b/defaults/main.yml index fcffe283..41b4ca27 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/releasenotes/notes/octavia_amphorav2_default-6fbe0f75327def69.yaml b/releasenotes/notes/octavia_amphorav2_default-6fbe0f75327def69.yaml new file mode 100644 index 00000000..11035f91 --- /dev/null +++ b/releasenotes/notes/octavia_amphorav2_default-6fbe0f75327def69.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Default provider driver for Octavia has been changed to ``amphorav2``, since + `amphora` and `octavia` drivers are deprecated for removal. diff --git a/templates/octavia.conf.j2 b/templates/octavia.conf.j2 index f7b82ce1..9b0b79de 100644 --- a/templates/octavia.conf.j2 +++ b/templates/octavia.conf.j2 @@ -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 diff --git a/vars/main.yml b/vars/main.yml index 90a81921..64822d21 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -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(',') }}