From b5c02ab37ed3e7faec8fce56df1dc7a953810d41 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Mon, 25 Feb 2019 14:08:37 +0000
Subject: [PATCH] Support multiple ceph-fs (mds) units

Prefix the mds cephx relation key with the provided mds-name
value, ensuring that multiple ceph-fs units can be used
within a deployment.

Change-Id: I4cbfc23886552352d06cf0e96b8459b1ce84a682
---
 hooks/ceph_hooks.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hooks/ceph_hooks.py b/hooks/ceph_hooks.py
index df438832..f4e4601c 100755
--- a/hooks/ceph_hooks.py
+++ b/hooks/ceph_hooks.py
@@ -623,7 +623,8 @@ def mds_relation_joined(relid=None, unit=None):
         public_addr = get_public_addr()
         data = {
             'fsid': leader_get('fsid'),
-            'mds_key': ceph.get_mds_key(name=mds_name),
+            '{}_mds_key'.format(mds_name):
+                ceph.get_mds_key(name=mds_name),
             'auth': config('auth-supported'),
             'ceph-public-address': public_addr}
         settings = relation_get(rid=relid, unit=unit)