From f666e602818df9f311e5b52e01c29c968693aa31 Mon Sep 17 00:00:00 2001 From: Dan Voiculeasa Date: Fri, 10 Apr 2020 16:53:34 +0300 Subject: [PATCH] Change ceph manager port Free port 5001 to be used by keystone. Story: 2007347 Task: 39393 Depends-On: Id789591bf22931494e970aaf3b12e9e5cbe223fa Change-Id: I45ee810c9b4686d98c246c3a73f21f0de4ba76a1 Signed-off-by: Dan Voiculeasa --- ceph/ceph-manager/ceph-manager/ceph_manager/constants.py | 3 +++ ceph/ceph-manager/ceph-manager/ceph_manager/server.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph/ceph-manager/ceph-manager/ceph_manager/constants.py b/ceph/ceph-manager/ceph-manager/ceph_manager/constants.py index 402c7f20..0a090aac 100644 --- a/ceph/ceph-manager/ceph-manager/ceph_manager/constants.py +++ b/ceph/ceph-manager/ceph-manager/ceph_manager/constants.py @@ -91,3 +91,6 @@ SB_TIER_CEPH_POOLS = sysinv_constants.SB_TIER_CEPH_POOLS # System SYSTEM_MODE_SIMPLEX = sysinv_constants.SYSTEM_MODE_SIMPLEX + +# Port on which ceph manager and ceph-mgr listens +CEPH_MGR_PORT = sysinv_constants.CEPH_MGR_PORT diff --git a/ceph/ceph-manager/ceph-manager/ceph_manager/server.py b/ceph/ceph-manager/ceph-manager/ceph_manager/server.py index dff2bd76..c90b1b86 100644 --- a/ceph/ceph-manager/ceph-manager/ceph_manager/server.py +++ b/ceph/ceph-manager/ceph-manager/ceph_manager/server.py @@ -140,7 +140,7 @@ class Service(SysinvConductorUpgradeApi, service.Service): topic=constants.SYSINV_CONDUCTOR_TOPIC)) self.ceph_api = wrapper.CephWrapper( - endpoint='https://localhost:5001') + endpoint='http://localhost:{}'.format(constants.CEPH_MGR_PORT)) # Get initial config from sysinv and send it to # services that need it before starting them