From: John Mulligan <jmulligan@redhat.com>
Date: Tue, 21 Mar 2023 15:42:25 +0000 (-0400)
Subject: mgr/cephadm: add two new ingress types for haproxy
X-Git-Tag: v18.2.1~326^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9cfc55051f56fda6fb36f1e85d38cb1263ef9be7;p=ceph.git

mgr/cephadm: add two new ingress types for haproxy

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 61f25e39a2146ebceef100abdf697d712defa5a4)
---

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 26966aa8fcf2..16cb8899f133 100644
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -179,6 +179,13 @@ class DaemonAction(enum.Enum):
 class IngressType(enum.Enum):
     default = 'default'
     keepalive_only = 'keepalive-only'
+    haproxy_standard = 'haproxy-standard'
+    haproxy_protocol = 'haproxy-protocol'
+
+    def canonicalize(self) -> "IngressType":
+        if self == self.default:
+            return self.haproxy_standard
+        return self
 
 
 def to_format(what: Any, format: Format, many: bool, cls: Any) -> Any: