]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/cephadm: add two new ingress types for haproxy
authorJohn Mulligan <jmulligan@redhat.com>
Tue, 21 Mar 2023 15:42:25 +0000 (11:42 -0400)
committerAdam King <adking@redhat.com>
Thu, 31 Aug 2023 17:36:15 +0000 (13:36 -0400)
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 61f25e39a2146ebceef100abdf697d712defa5a4)

src/pybind/mgr/orchestrator/module.py

index 26966aa8fcf29130dc33314732dbb016e4535038..16cb8899f1333eb5eeb032f94a848440307dda50 100644 (file)
@@ -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: