From ac35cc5dc93f9beabf865c47f2039d8c65613119 Mon Sep 17 00:00:00 2001 From: Changcheng Liu Date: Sat, 2 Feb 2019 22:02:14 +0800 Subject: [PATCH] ceph-manager: update mgr-restful-plugin endpoint ceph-rest-api was removed in Ceph Mimic. Update endpoint to remove "api/v0.1" path that's not needed by ceph-mgr restful plugin. Story: 2003605 Task: 28860 Depends-On: I1952a12032bcd08d17786bd817d1e15ce36d5afd Change-Id: I7c6bff4d8986c1fd75c3c9d353557c5eafcdcde0 Co-Authored-By: Daniel Badea Signed-off-by: Changcheng Liu Signed-off-by: Daniel Badea --- ceph/ceph-manager/centos/build_srpm.data | 2 +- ceph/ceph-manager/ceph-manager/ceph_manager/server.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph/ceph-manager/centos/build_srpm.data b/ceph/ceph-manager/centos/build_srpm.data index d01510bde..f951ada81 100644 --- a/ceph/ceph-manager/centos/build_srpm.data +++ b/ceph/ceph-manager/centos/build_srpm.data @@ -1,3 +1,3 @@ SRC_DIR="ceph-manager" COPY_LIST_TO_TAR="files scripts" -TIS_PATCH_VER=4 +TIS_PATCH_VER=5 diff --git a/ceph/ceph-manager/ceph-manager/ceph_manager/server.py b/ceph/ceph-manager/ceph-manager/ceph_manager/server.py index 18f21243b..05b8f5a13 100644 --- a/ceph/ceph-manager/ceph-manager/ceph_manager/server.py +++ b/ceph/ceph-manager/ceph-manager/ceph_manager/server.py @@ -143,7 +143,7 @@ class Service(SysinvConductorUpgradeApi, service.Service): topic=constants.SYSINV_CONDUCTOR_TOPIC)) self.ceph_api = wrapper.CephWrapper( - endpoint='http://localhost:5001/api/v0.1/') + endpoint='https://localhost:5001') # Get initial config from sysinv and send it to # services that need it before starting them