From: Tim Serong Date: Tue, 12 Mar 2019 09:07:49 +0000 (+1100) Subject: mgr/deepsea: always use 'password' parameter for salt-api auth X-Git-Tag: v14.2.0~59^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26904%2Fhead;p=ceph.git 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 --- diff --git a/src/pybind/mgr/deepsea/module.py b/src/pybind/mgr/deepsea/module.py index e31a18c4bbbf..c108fea8aa60 100644 --- 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']