From 248df772fd5b6a43c6f6fb74de19a6057f3a5143 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Fri, 21 Jun 2019 15:02:16 -0500
Subject: [PATCH] Ceph-Mgr: update how we set config params

This PS updates the start script to use `config set`, rather
than `config-key set` which has been depricated in Mimic.

Change-Id: I97d0c4385b016d73aa362c0fc293d235b532810c
Signed-off-by: Pete Birley <pete@port.direct>
---
 ceph-client/templates/bin/mgr/_start.sh.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ceph-client/templates/bin/mgr/_start.sh.tpl b/ceph-client/templates/bin/mgr/_start.sh.tpl
index 432436d107..6d757f66e2 100644
--- a/ceph-client/templates/bin/mgr/_start.sh.tpl
+++ b/ceph-client/templates/bin/mgr/_start.sh.tpl
@@ -40,7 +40,7 @@ ceph --cluster "${CLUSTER}" -v
 
 # Env. variables matching the pattern "<module>_" will be
 # found and parsed for config-key settings by
-#  ceph config-key set mgr/<module>/<key> <value>
+#  ceph config set mgr mgr/<module>/<key> <value>
 MODULES_TO_DISABLE=`ceph mgr dump | python -c "import json, sys; print ' '.join(json.load(sys.stdin)['modules'])"`
 
 for module in ${ENABLED_MODULES}; do
@@ -54,7 +54,7 @@ for module in ${ENABLED_MODULES}; do
         option=${option/${module}_/}
         key=`echo $option | cut -d= -f1`
         value=`echo $option | cut -d= -f2`
-        ceph --cluster "${CLUSTER}" config-key set mgr/$module/$key $value
+        ceph --cluster "${CLUSTER}" config set mgr mgr/$module/$key $value
     done
     ceph --cluster "${CLUSTER}" mgr module enable ${module} --force
 done