From 4e44edd9cea1afe8494f43395b3af125e8dd4684 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Thu, 14 Mar 2019 21:10:38 +1100 Subject: [PATCH] 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 (cherry picked from commit e81f109bf93317b998d3ea31d64381d9f491a6ef) --- src/pybind/mgr/deepsea/module.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/deepsea/module.py b/src/pybind/mgr/deepsea/module.py index c108fea8aa609..8fdb4e4fb4d85 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': '' } ] -- 2.39.5