From e406346c98fb7aab93a71bf6e9fdf34fc543835a Mon Sep 17 00:00:00 2001 From: zhipengl Date: Thu, 29 Nov 2018 23:45:13 +0800 Subject: [PATCH] Refactor patches for rabbitmq-server package After using rabbitmq-server-config package to package config files for rabbitmq-server package, we can remove related patches of it. We need to let SM to call our custom ocf file instead of default one installed by rabbitmq-server package. Story: 2003768 Task: 28042 Change-Id: I12e132831d064daa00f26d44df505870a71c45ef Signed-off-by: zhipengl --- .../sm-db-1.0.0/database/create_sm_db.sql | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/service-mgmt/sm-db-1.0.0/database/create_sm_db.sql b/service-mgmt/sm-db-1.0.0/database/create_sm_db.sql index ab51b058..2be76922 100644 --- a/service-mgmt/sm-db-1.0.0/database/create_sm_db.sql +++ b/service-mgmt/sm-db-1.0.0/database/create_sm_db.sql @@ -591,10 +591,10 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('postgres','enable','ocf-script','heartbeat INSERT INTO "SERVICE_ACTIONS" VALUES('postgres','disable','ocf-script','heartbeat','pgsql','stop','',1,1,1,60,''); INSERT INTO "SERVICE_ACTIONS" VALUES('postgres','audit-enabled','ocf-script','heartbeat','pgsql','monitor','',2,2,2,60,30); INSERT INTO "SERVICE_ACTIONS" VALUES('postgres','audit-disabled','ocf-script','heartbeat','pgsql','monitor','',0,0,0,60,30); -INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','enable','ocf-script','rabbitmq','rabbitmq-server','start','',2,2,2,60,20); -INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','disable','ocf-script','rabbitmq','rabbitmq-server','stop','',1,1,1,60,20); -INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','audit-enabled','ocf-script','rabbitmq','rabbitmq-server','monitor','',2,2,2,30,20); -INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','audit-disabled','ocf-script','rabbitmq','rabbitmq-server','monitor','',0,0,0,15,20); +INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','enable','ocf-script','rabbitmq','stx.rabbitmq-server','start','',2,2,2,60,20); +INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','disable','ocf-script','rabbitmq','stx.rabbitmq-server','stop','',1,1,1,60,20); +INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','audit-enabled','ocf-script','rabbitmq','stx.rabbitmq-server','monitor','',2,2,2,30,20); +INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','audit-disabled','ocf-script','rabbitmq','stx.rabbitmq-server','monitor','',0,0,0,15,20); INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-export-fs','enable','ocf-script','heartbeat','exportfs','start','',2,2,2,40,''); INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-export-fs','disable','ocf-script','heartbeat','exportfs','stop','',1,1,1,15,''); INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-export-fs','audit-enabled','ocf-script','heartbeat','exportfs','monitor','',2,2,2,20,30); @@ -817,10 +817,10 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('murano-engine','enable','ocf-script','open INSERT INTO "SERVICE_ACTIONS" VALUES('murano-engine','disable','ocf-script','openstack','murano-engine','stop','',1,1,1,20,''); INSERT INTO "SERVICE_ACTIONS" VALUES('murano-engine','audit-enabled','ocf-script','openstack','murano-engine','monitor','',2,2,2,30,30); INSERT INTO "SERVICE_ACTIONS" VALUES('murano-engine','audit-disabled','ocf-script','openstack','murano-engine','monitor','',0,0,0,30,30); -INSERT INTO "SERVICE_ACTIONS" VALUES('murano-rabbit','enable','ocf-script','rabbitmq','rabbitmq-server','start','',2,2,2,60,20); -INSERT INTO "SERVICE_ACTIONS" VALUES('murano-rabbit','disable','ocf-script','rabbitmq','rabbitmq-server','stop','',1,1,1,60,20); -INSERT INTO "SERVICE_ACTIONS" VALUES('murano-rabbit','audit-enabled','ocf-script','rabbitmq','rabbitmq-server','monitor','',2,2,2,15,20); -INSERT INTO "SERVICE_ACTIONS" VALUES('murano-rabbit','audit-disabled','ocf-script','rabbitmq','rabbitmq-server','monitor','',0,0,0,15,20); +INSERT INTO "SERVICE_ACTIONS" VALUES('murano-rabbit','enable','ocf-script','rabbitmq','stx.rabbitmq-server','start','',2,2,2,60,20); +INSERT INTO "SERVICE_ACTIONS" VALUES('murano-rabbit','disable','ocf-script','rabbitmq','stx.rabbitmq-server','stop','',1,1,1,60,20); +INSERT INTO "SERVICE_ACTIONS" VALUES('murano-rabbit','audit-enabled','ocf-script','rabbitmq','stx.rabbitmq-server','monitor','',2,2,2,15,20); +INSERT INTO "SERVICE_ACTIONS" VALUES('murano-rabbit','audit-disabled','ocf-script','rabbitmq','stx.rabbitmq-server','monitor','',0,0,0,15,20); INSERT INTO "SERVICE_ACTIONS" VALUES('panko-api','enable','ocf-script','openstack','panko-api','start','',2,2,2,20,''); INSERT INTO "SERVICE_ACTIONS" VALUES('panko-api','disable','ocf-script','openstack','panko-api','stop','',1,1,1,20,''); INSERT INTO "SERVICE_ACTIONS" VALUES('panko-api','audit-enabled','ocf-script','openstack','panko-api','monitor','',2,2,2,30,30);