From b61b8578ace870f52a8ca14d98272ccf3809a89c Mon Sep 17 00:00:00 2001 From: Hediberto C Silva Date: Tue, 2 Apr 2024 16:28:19 -0300 Subject: [PATCH] [WIP] AIO-DX: Ceph Improvements Adding two fixed Ceph monitors for controllers. Includes: - Changes the ceph-mon argument from mon to mon.controller in SM. Since it is only used in AIO-DX, this change prevents the ceph-init-wrapper from managing other fixed monitors. Change-Id: I5731e2ac3cf726eed765645b95c392ea55b1c94f Signed-off-by: Hediberto C Silva --- service-mgmt/sm-db/database/create_sm_db.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/service-mgmt/sm-db/database/create_sm_db.sql b/service-mgmt/sm-db/database/create_sm_db.sql index c7f7abd1..8459fa9a 100644 --- a/service-mgmt/sm-db/database/create_sm_db.sql +++ b/service-mgmt/sm-db/database/create_sm_db.sql @@ -721,10 +721,10 @@ INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','controller-services INSERT INTO "SERVICES" SELECT MAX(id) + 1, 'no','ceph-mon','initial','initial','none','none',2,1,90000,4,16,'/var/run/ceph/mon.controller.pid' FROM "SERVICES"; INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceph-mon','not-applicable','enable','management-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','disable','ceph-mon','disabled'); -INSERT INTO "SERVICE_ACTIONS" VALUES('ceph-mon','enable','lsb-script','','ceph-init-wrapper','start','ARGS=mon',2,2,2,30,''); -INSERT INTO "SERVICE_ACTIONS" VALUES('ceph-mon','disable','lsb-script','','ceph-init-wrapper','stop','ARGS=mon',1,1,1,30,''); -INSERT INTO "SERVICE_ACTIONS" VALUES('ceph-mon','audit-enabled','lsb-script','','ceph-init-wrapper','status','ARGS=mon',2,2,2,15,40); -INSERT INTO "SERVICE_ACTIONS" VALUES('ceph-mon','audit-disabled','lsb-script','','ceph-init-wrapper','status','ARGS=mon',0,0,0,15,40); +INSERT INTO "SERVICE_ACTIONS" VALUES('ceph-mon','enable','lsb-script','','ceph-init-wrapper','start','ARGS=mon.controller',2,2,2,30,''); +INSERT INTO "SERVICE_ACTIONS" VALUES('ceph-mon','disable','lsb-script','','ceph-init-wrapper','stop','ARGS=mon.controller',1,1,1,30,''); +INSERT INTO "SERVICE_ACTIONS" VALUES('ceph-mon','audit-enabled','lsb-script','','ceph-init-wrapper','status','ARGS=mon.controller',2,2,2,15,40); +INSERT INTO "SERVICE_ACTIONS" VALUES('ceph-mon','audit-disabled','lsb-script','','ceph-init-wrapper','status','ARGS=mon.controller',0,0,0,15,40); INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','controller-services','cephmon-fs','critical' FROM "SERVICE_GROUP_MEMBERS"; INSERT INTO "SERVICES" SELECT MAX(id) + 1,'no','cephmon-fs','initial','initial','none','none',2,1,90000,4,16,'' FROM "SERVICES"; INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cephmon-fs','not-applicable','enable','drbd-cephmon','enabled-active');