starlingx/utilities
Code Issues Proposed changes

Merge "Get certificate with mgr name instead of hostname"

Browse Source
This commit is contained in:
Zuul 2024-08-01 20:37:08 +00:00 committed by Gerrit Code Review
commit 1c5b26c004
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ceph/python-cephclient/python-cephclient/cephclient/client.py
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2019-2021 Wind River Systems, Inc. # Copyright (c) 2019-2021,2024 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -114,10 +114,10 @@ class CephClient(object):
raise exception.CephMgrMissingRestfulService( raise exception.CephMgrMissingRestfulService(
status.get('services', '')) status.get('services', ''))
def _get_service_hostname(self): def _get_service_active_mgr(self):
try: try:
output = subprocess.check_output( output = subprocess.check_output(
'ceph mgr metadata', 'ceph mgr dump',
timeout=CEPH_CLI_TIMEOUT_SEC, timeout=CEPH_CLI_TIMEOUT_SEC,
shell=True) shell=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
@ -125,19 +125,19 @@ class CephClient(object):
except subprocess.TimeoutExpired as e: except subprocess.TimeoutExpired as e:
raise exception.CephCliTimeoutExpired(str(e)) raise exception.CephCliTimeoutExpired(str(e))
try: try:
status = json.loads(output) dump = json.loads(output)
except (KeyError, ValueError): except (KeyError, ValueError):
raise exception.CephMgrJsonError(output) raise exception.CephMgrJsonError(output)
return status[0]["hostname"] return dump["active_name"]
def _get_certificate(self): def _get_certificate(self):
self._cleanup_certificate() self._cleanup_certificate()
hostname = self._get_service_hostname() active_mgr = self._get_service_active_mgr()
try: try:
certificate = subprocess.check_output( certificate = subprocess.check_output(
('ceph config-key get ' ('ceph config-key get '
'mgr/restful/{}/crt').format( 'mgr/restful/{}/crt').format(
hostname), active_mgr),
timeout=CEPH_CLI_TIMEOUT_SEC, timeout=CEPH_CLI_TIMEOUT_SEC,
shell=True) shell=True)
except (subprocess.CalledProcessError, subprocess.TimeoutExpired): except (subprocess.CalledProcessError, subprocess.TimeoutExpired):