RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-rest-api: understand the new style entity_addr_t representation

Browse Source 
the new entity_addr_t representation was introduced by 3561eb3, we
should update ceph_rest_api.py accordingly.

Fixes: http://tracker.ceph.com/issues/17742
Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2016-10-30 01:19:06 +08:00
parent 7842ea170d
commit f50086db55
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pybind/ceph_rest_api.py
View File

@ -111,9 +111,18 @@ def api_setup(app, conf, cluster, clientname, clientid, args):
app.ceph_baseurl = app.ceph_baseurl[:-1]
addr = app.ceph_cluster.conf_get('public_addr') or DEFAULT_ADDR
# remove any nonce from the conf value
addr = addr.split('/')[0]
addr, port = addr.rsplit(':', 1)
if addr == '-':
addr = None
port = None
else:
# remove the type prefix from the conf value if any
for t in ('legacy:', 'msgr2:'):
if addr.startswith(t):
addr = addr[len(t):]
break
# remove any nonce from the conf value
addr = addr.split('/')[0]
addr, port = addr.rsplit(':', 1)
addr = addr or DEFAULT_ADDR
port = port or DEFAULT_PORT
port = int(port)