From f8c32fcba88589d4332450bd3269b1e7a9dd35b0 Mon Sep 17 00:00:00 2001
From: Matt Crees <mattc@stackhpc.com>
Date: Mon, 19 May 2025 10:46:02 +0100
Subject: [PATCH] Magnum: default to OVN load balanacer provider

---
 README.rst                                 | 11 ++++++++---
 ansible/templates/magnum-capi-templates.j2 |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index b018355..3ba2e13 100644
--- a/README.rst
+++ b/README.rst
@@ -93,12 +93,17 @@ variables in `etc/openstack-config.yml`
    magnum_default_worker_flavor_name:
    # External network to use for load balancers etc.
    magnum_external_net_name:
-   # Octavia provider (e.g. 'ovn')
-   magnum_loadbalancer_provider:
    # Optional list of extra labels to add to all generated cluster templates
    magnum_template_extra_labels:
 
-then run the provided playbook with
+The load balancer provider defaults to OVN. This can be changed to Amphora, but you
+should only do this if OVN load balancers are unavailable.
+
+.. code-block:: yaml
+
+   magnum_loadbalancer_provider: amphora
+
+Then run the provided playbook with
 
 .. code-block:: bash
 
diff --git a/ansible/templates/magnum-capi-templates.j2 b/ansible/templates/magnum-capi-templates.j2
index a555b1d..2476997 100644
--- a/ansible/templates/magnum-capi-templates.j2
+++ b/ansible/templates/magnum-capi-templates.j2
@@ -15,7 +15,7 @@
     kube_dashboard_enabled: "true"
     keystone_auth_enabled: "false"
     capi_helm_chart_version: "{{ capi_helm_chart_release_data.json.tag_name }}"
-    octavia_provider: {{ magnum_loadbalancer_provider }}
+    octavia_provider: {{ magnum_loadbalancer_provider | default('ovn') }}
 {% if magnum_template_extra_labels is defined and magnum_template_extra_labels is not none %}
     {{ magnum_template_extra_labels | to_nice_yaml | indent(4) -}}
 {% endif %}