From: Tim Serong <tserong@suse.com>
Date: Thu, 14 Mar 2019 10:10:38 +0000 (+1100)
Subject: mgr/deepsea: use empty strings rather than None for option defaults
X-Git-Tag: v14.2.1~73^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e44edd9cea1afe8494f43395b3af125e8dd4684;p=ceph.git

mgr/deepsea: use empty strings rather than None for option defaults

This makes the _config_valid() function work properly; the option
defaults are being strinified somewhere, so we need to use empty
strings rather than None (which becomes "None"), in order to check
if they're set or not.

Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit e81f109bf93317b998d3ea31d64381d9f491a6ef)
---

diff --git a/src/pybind/mgr/deepsea/module.py b/src/pybind/mgr/deepsea/module.py
index c108fea8aa60..8fdb4e4fb4d8 100644
--- a/src/pybind/mgr/deepsea/module.py
+++ b/src/pybind/mgr/deepsea/module.py
@@ -47,7 +47,7 @@ class DeepSeaOrchestrator(MgrModule, orchestrator.Orchestrator):
     MODULE_OPTIONS = [
         {
             'name': 'salt_api_url',
-            'default': None
+            'default': ''
         },
         {
             'name': 'salt_api_eauth',
@@ -55,11 +55,11 @@ class DeepSeaOrchestrator(MgrModule, orchestrator.Orchestrator):
         },
         {
             'name': 'salt_api_username',
-            'default': None
+            'default': ''
         },
         {
             'name': 'salt_api_password',
-            'default': None
+            'default': ''
         }
     ]