mgr/deepsea: always use 'password' parameter for salt-api auth

Prior to https://github.com/saltstack/salt/commit/71d5601507, the
salt-api expected the password to be sent using the 'sharedsecret'
parameter if using shared secrets, and the 'password' parameter
for other authentication types.  The above commit unifies this so
that we always only need to use the 'password' parameter.

Signed-off-by: Tim Serong <tserong@suse.com>

diff --git a/src/pybind/mgr/deepsea/module.py b/src/pybind/mgr/deepsea/module.py
index e31a18c4bbbf81928243af61ae02d328d7cc0950..c108fea8aa6098db53364e9727c98a304775fb63 100644 (file)
--- a/src/pybind/mgr/deepsea/module.py
+++ b/src/pybind/mgr/deepsea/module.py
@@ -441,7 +441,7 @@ class DeepSeaOrchestrator(MgrModule, orchestrator.Orchestrator):
     def _login(self):
         resp = self._do_request('POST', 'login', data = {
             "eauth": self.get_module_option('salt_api_eauth'),
-            "sharedsecret" if self.get_module_option('salt_api_eauth') == 'sharedsecret' else 'password': self.get_module_option('salt_api_password'),
+            "password": self.get_module_option('salt_api_password'),
             "username": self.get_module_option('salt_api_username')
         })
         self._token = resp.json()['return'][0]['token']