mgr/cephadm: implement get_daemon_deployment_ordering for ingress

We will now deploy haproxy daemons before keepalive daemons
in cases where the scheduler decides we need to deploy both.

Signed-off-by: Adam King <[email protected]>
(cherry picked from commit d2a9f8c)

Resolves: rhbz#2372821

Author: adk3798

src/pybind/mgr/cephadm/services/ingress.py

@@ -74,6 +74,20 @@ def generate_config(
             return self.keepalived_generate_config(daemon_spec)
         assert False, "unexpected daemon type"
 
+    def get_daemon_deployment_ordering(self, daemons: List[CephadmDaemonDeploySpec]) -> Dict[int, List[CephadmDaemonDeploySpec]]:
+        if not daemons:
+            return {}
+        dtype = daemons[0].daemon_type
+        if not any(d.daemon_type != dtype for d in daemons):
+            # if all the daemons we got are the same type we can
+            # just deploy them in parallel
+            return {0: daemons}
+        # if we got here, we should have both haproxy and keepalived daemons
+        ordering: Dict[int, List[CephadmDaemonDeploySpec]] = {}
+        ordering[0] = [d for d in daemons if d.daemon_type == 'haproxy']
+        ordering[1] = [d for d in daemons if d.daemon_type == 'keepalived']
+        return ordering
+
     def haproxy_prepare_create(
             self,
             daemon_spec: CephadmDaemonDeploySpec,