commit 434f02e17e006713542a63f7df5ad68af565e339
author Mohammed Naser <mnaser@vexxhost.com> Tue Jun 18 18:54:35 2024 -0400
committer GitHub <noreply@github.com> Tue Jun 18 22:54:35 2024 +0000
tree f123fa1e31bca3c7394300e8905e81114fa5d96a
parent a026e1a85c8a7d2bca7f8ed154da749072e89f3b

[stable/zed] fix: neutron designate integration (#1401)

Set _neutron_external_dns_driver before __neutron_helm_values and __neutron_ovn_helm_values. In other case it is always omitted.
Even if we set external_dns_driver to designate: https://opendev.org/openstack/openstack-helm/src/branch/master/neutron/templates/configmap-etc.yaml#L222
There is a bug/typo  upstream which sets Keystone URI to Designate endpoint: https://opendev.org/openstack/openstack-helm/src/branch/master/neutron/templates/configmap-etc.yaml#L239
Adding auth_url and url accordingly until this will be fixed.

roles/neutron/tasks/main.yml

diff --git a/roles/neutron/tasks/main.yml b/roles/neutron/tasks/main.yml
index 397a64d..dbdb4ab 100644
--- a/roles/neutron/tasks/main.yml
+++ b/roles/neutron/tasks/main.yml
@@ -36,6 +36,11 @@
         name: "{{ neutron_helm_release_name }}"
         namespace: "{{ neutron_helm_release_namespace }}"
 
+- name: Set external_dns_driver
+  ansible.builtin.set_fact:
+    _neutron_external_dns_driver: "designate"
+  when: neutron_designate_integration_enabled | bool
+
 - name: Generate Helm values
   ansible.builtin.set_fact:
     _neutron_helm_values: "{{ __neutron_helm_values }}"
@@ -45,11 +50,6 @@
   ansible.builtin.set_fact:
     _neutron_helm_values: "{{ _neutron_helm_values | combine(__neutron_ovn_helm_values, recursive=True) }}"
 
-- name: Set external_dns_driver
-  ansible.builtin.set_fact:
-    _neutron_external_dns_driver: "designate"
-  when: neutron_designate_integration_enabled | bool
-
 - name: Deploy Helm chart
   run_once: true
   kubernetes.core.helm:

roles/neutron/vars/main.yml

diff --git a/roles/neutron/vars/main.yml b/roles/neutron/vars/main.yml
index 151363d..0a929c3 100644
--- a/roles/neutron/vars/main.yml
+++ b/roles/neutron/vars/main.yml
@@ -36,6 +36,12 @@
       database:
         connection_recycle_time: 10
         max_pool_size: 1
+      designate:
+        url: http://designate-api.openstack.svc.cluster.local:9001/v2
+        auth_url: http://keystone-api.openstack.svc.cluster.local:5000
+        region_name: "{{ openstack_helm_endpoints_neutron_region_name }}"
+        username: "neutron-{{ openstack_helm_endpoints_neutron_region_name }}"
+        password: "{{ openstack_helm_endpoints_neutron_keystone_password }}"
       nova:
         live_migration_events: true
       placement: