Merge pull request ceph#62891 from ShwetaBhosale1/fix_issue_70985_nfs_add_vip_in_HAProxy_Hosts_list

mgr/nfs: Add VIP to HAProxy_Hosts list for ingress type haproxy-protocol

Reviewed-by: Adam King <[email protected]>

Author: adk3798

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

@@ -102,7 +102,7 @@ def generate_config(self, daemon_spec: CephadmDaemonDeploySpec) -> Tuple[Dict[st
         # create the RGW keyring
         rgw_user = f'{rados_user}-rgw'
         rgw_keyring = self.create_rgw_keyring(daemon_spec)
-        if spec.virtual_ip:
+        if spec.virtual_ip and not spec.enable_haproxy_protocol:
             bind_addr = spec.virtual_ip
             daemon_spec.port_ips = {str(port): spec.virtual_ip}
         else:
@@ -132,6 +132,8 @@ def get_ganesha_conf() -> str:
             }
             if spec.enable_haproxy_protocol:
                 context["haproxy_hosts"] = self._haproxy_hosts()
+                if spec.virtual_ip:
+                    context["haproxy_hosts"].append(spec.virtual_ip)
                 logger.debug("selected haproxy_hosts: %r", context["haproxy_hosts"])
             return self.mgr.template.render('services/nfs/ganesha.conf.j2', context)
 

src/pybind/mgr/nfs/cluster.py

@@ -84,11 +84,12 @@ def _call_orch_apply_nfs(
             virtual_ip_for_ganesha: Optional[str] = None
             keepalive_only: bool = False
             enable_haproxy_protocol: bool = False
+            if ingress_mode != IngressType.haproxy_standard:
+                virtual_ip_for_ganesha = virtual_ip.split('/')[0]
             if ingress_mode == IngressType.haproxy_protocol:
                 enable_haproxy_protocol = True
             elif ingress_mode == IngressType.keepalive_only:
                 keepalive_only = True
-                virtual_ip_for_ganesha = virtual_ip.split('/')[0]
                 ganesha_port = port
                 frontend_port = None