update ceph source to reef 18.2.1

[ceph.git] / ceph / src / pybind / mgr / cephadm / templates / services / ingress / keepalived.conf.j2

diff --git a/ceph/src/pybind/mgr/cephadm/templates/services/ingress/keepalived.conf.j2 b/ceph/src/pybind/mgr/cephadm/templates/services/ingress/keepalived.conf.j2
index f560c9756654d0d51a025dc37d668ee7575023da..e19f556c6f42727247600466ffdd7097df9b80a5 100644 (file)
--- a/ceph/src/pybind/mgr/cephadm/templates/services/ingress/keepalived.conf.j2
+++ b/ceph/src/pybind/mgr/cephadm/templates/services/ingress/keepalived.conf.j2
@@ -11,21 +11,23 @@ vrrp_script check_backend {
 vrrp_instance VI_{{ x }} {
   state {{ states[x] }}
   priority {{ priorities[x] }}
-  interface {{ interface }}
-  virtual_router_id {{ 50 + x }}
+  interface {{ vrrp_interfaces[x] }}
+  virtual_router_id {{ first_virtual_router_id + x }}
   advert_int 1
   authentication {
       auth_type PASS
       auth_pass {{ password }}
   }
-  unicast_src_ip {{ host_ip }}
+{% if not spec.use_keepalived_multicast %}
+  unicast_src_ip {{ host_ips[x] }}
   unicast_peer {
-    {% for ip in other_ips %}
+    {% for ip in other_ips[x] %}
     {{ ip }}
     {% endfor %}
   }
+{% endif %}
   virtual_ipaddress {
-    {{ virtual_ips[x] }} dev {{ interface }}
+    {{ virtual_ips[x] }} dev {{ interfaces[x] }}
   }
   track_script {
       check_backend