From 52a3e8dffcc593333e5f32d06c7cd0c355f90b57 Mon Sep 17 00:00:00 2001
From: guilhermesteinmuller <gsteinmuller@vexxhost.com>
Date: Mon, 20 Sep 2021 15:25:49 -0300
Subject: [PATCH] Fix transport_url

We have observed that omitting statefulset
on the olso_messaging values can cause octavia
workers to ocasionally fail with:

AMQP server on rabbitmq.openstack.svc.cluster.local:5672 is unreachable:
[Errno 104] Connection reset by peer. Trying again in 1 seconds.:
ConnectionResetError: [Errno 104] Connection reset by peer

This patch aims to keep the pattern used on the other serivces
to setup the transport_url that includes all pods in the statefulset.

Change-Id: I1905dc8f443929a03786fd01d6cf4e50ff5d3cb2
---
 octavia/Chart.yaml                   | 2 +-
 octavia/templates/configmap-etc.yaml | 2 +-
 octavia/values.yaml                  | 3 +++
 releasenotes/notes/octavia.yaml      | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/octavia/Chart.yaml b/octavia/Chart.yaml
index 174ec421b3..88d67b7d90 100644
--- a/octavia/Chart.yaml
+++ b/octavia/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Octavia
 name: octavia
-version: 0.2.3
+version: 0.2.4
 home: https://docs.openstack.org/octavia/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png
 sources:
diff --git a/octavia/templates/configmap-etc.yaml b/octavia/templates/configmap-etc.yaml
index e8d166c6ff..8d3a653084 100644
--- a/octavia/templates/configmap-etc.yaml
+++ b/octavia/templates/configmap-etc.yaml
@@ -85,7 +85,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.octavia.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "octavia" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.octavia.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "octavia" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.octavia.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if and (empty .Values.conf.logging.handler_fluent) (has "fluent" .Values.conf.logging.handlers.keys) -}}
diff --git a/octavia/values.yaml b/octavia/values.yaml
index 926ca3a3e8..8ba4e7b138 100644
--- a/octavia/values.yaml
+++ b/octavia/values.yaml
@@ -459,6 +459,9 @@ endpoints:
       octavia:
         username: octavia
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/releasenotes/notes/octavia.yaml b/releasenotes/notes/octavia.yaml
index c721edfb55..0cdd749a81 100644
--- a/releasenotes/notes/octavia.yaml
+++ b/releasenotes/notes/octavia.yaml
@@ -7,4 +7,5 @@ octavia:
   - 0.2.1 Fix dnsPolicy for housekeeping service
   - 0.2.2 Update htk requirements repo
   - 0.2.3 Allow using log_config_append=null
+  - 0.2.4 Fix transport_url
 ...