From b616bfb83d953a93a1ed4177a6b7780db91f40bf Mon Sep 17 00:00:00 2001 From: Eric MacDonald Date: Wed, 24 Oct 2018 15:36:41 -0400 Subject: [PATCH] Implement Active-Active Heartbeat as HA Improvement This update removes the hbsAgent from the SM database so that it is no longer an SM managed/monitored process. Story: 2003576 Task: 24907 Depends-On: https://review.openstack.org/#/c/617835 Change-Id: I12a8776d45c680dfe2fa9b8e2bf7cf3897ca9e1b Signed-off-by: Eric MacDonald --- service-mgmt/sm-db-1.0.0/centos/build_srpm.data | 2 +- service-mgmt/sm-db-1.0.0/database/create_sm_db.sql | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/service-mgmt/sm-db-1.0.0/centos/build_srpm.data b/service-mgmt/sm-db-1.0.0/centos/build_srpm.data index 998c72e2..01914d70 100644 --- a/service-mgmt/sm-db-1.0.0/centos/build_srpm.data +++ b/service-mgmt/sm-db-1.0.0/centos/build_srpm.data @@ -2,4 +2,4 @@ SRC_DIR=`pwd` COPY_LIST="$PKG_BASE/LICENSE" TAR_NAME=sm-db VERSION=1.0.0 -TIS_PATCH_VER=25 +TIS_PATCH_VER=26 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 8f846ef1..4645abdd 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 @@ -53,7 +53,6 @@ INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(17,'yes','controller-services','platf INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(18,'yes','controller-services','sysinv-inv','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(19,'yes','controller-services','sysinv-conductor','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(20,'yes','controller-services','mtc-agent','critical'); -INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(21,'yes','controller-services','hbs-agent','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(22,'yes','controller-services','hw-mon','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(23,'yes','controller-services','dnsmasq','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(24,'yes','controller-services','fm-mgr','critical'); @@ -149,7 +148,6 @@ INSERT INTO "SERVICES" VALUES(17,'yes','platform-nfs-ip','initial','initial','no INSERT INTO "SERVICES" VALUES(18,'yes','sysinv-inv','initial','initial','none','none',2,1,90000,4,16,'/var/run/sysinv-api.pid'); INSERT INTO "SERVICES" VALUES(19,'yes','sysinv-conductor','initial','initial','none','none',2,1,90000,4,16,'/var/run/sysinv-conductor.pid'); INSERT INTO "SERVICES" VALUES(20,'yes','mtc-agent','initial','initial','none','none',2,1,90000,4,16,'/var/run/mtcAgent.pid'); -INSERT INTO "SERVICES" VALUES(21,'yes','hbs-agent','initial','initial','none','none',2,1,90000,4,16,'/var/run/hbsAgent.pid'); INSERT INTO "SERVICES" VALUES(22,'yes','hw-mon','initial','initial','none','none',2,1,90000,4,16,'/var/run/hwmond.pid'); INSERT INTO "SERVICES" VALUES(23,'yes','dnsmasq','initial','initial','none','none',2,1,90000,4,16,'/var/run/dnsmasq.pid'); INSERT INTO "SERVICES" VALUES(24,'yes','fm-mgr','initial','initial','none','none',2,1,90000,4,16,'/var/run/fmManager.pid'); @@ -251,7 +249,6 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','sysinv-conductor','not-applica INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','sysinv-conductor','not-applicable','enable','platform-nfs-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','sysinv-inv','not-applicable','enable','sysinv-conductor','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','mtc-agent','not-applicable','enable','sysinv-inv','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','hbs-agent','not-applicable','enable','mtc-agent','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','hw-mon','not-applicable','enable','mtc-agent','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','guest-agent','not-applicable','enable','mtc-agent','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','vim','not-applicable','enable','mtc-agent','enabled-active'); @@ -371,11 +368,9 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-nfs-ip','not-applicab INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','sysinv-conductor','not-applicable','disable','sysinv-inv','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','sysinv-inv','not-applicable','disable','mtc-agent','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','sysinv-conductor','not-applicable','disable','dnsmasq','disabled'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','mtc-agent','not-applicable','disable','hbs-agent','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','mtc-agent','not-applicable','disable','hw-mon','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','mtc-agent','not-applicable','disable','guest-agent','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','mtc-agent','not-applicable','disable','vim','disabled'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','hbs-agent','not-applicable','disable','',''); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','hw-mon','not-applicable','disable','',''); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','vim','not-applicable','disable','vim-api','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','vim','not-applicable','disable','vim-webserver','disabled'); @@ -618,10 +613,6 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('mtc-agent','enable','ocf-script','platform INSERT INTO "SERVICE_ACTIONS" VALUES('mtc-agent','disable','ocf-script','platform','mtcAgent','stop','',1,1,1,15,''); INSERT INTO "SERVICE_ACTIONS" VALUES('mtc-agent','audit-enabled','ocf-script','platform','mtcAgent','monitor','',2,2,2,15,40); INSERT INTO "SERVICE_ACTIONS" VALUES('mtc-agent','audit-disabled','ocf-script','platform','mtcAgent','monitor','',0,0,0,15,40); -INSERT INTO "SERVICE_ACTIONS" VALUES('hbs-agent','enable','ocf-script','platform','hbsAgent','start','',2,2,2,15,''); -INSERT INTO "SERVICE_ACTIONS" VALUES('hbs-agent','disable','ocf-script','platform','hbsAgent','stop','',1,1,1,15,''); -INSERT INTO "SERVICE_ACTIONS" VALUES('hbs-agent','audit-enabled','ocf-script','platform','hbsAgent','monitor','',2,2,2,15,40); -INSERT INTO "SERVICE_ACTIONS" VALUES('hbs-agent','audit-disabled','ocf-script','platform','hbsAgent','monitor','',0,0,0,15,40); INSERT INTO "SERVICE_ACTIONS" VALUES('hw-mon','enable','ocf-script','platform','hwmon','start','',2,2,2,15,''); INSERT INTO "SERVICE_ACTIONS" VALUES('hw-mon','disable','ocf-script','platform','hwmon','stop','',1,1,1,15,''); INSERT INTO "SERVICE_ACTIONS" VALUES('hw-mon','audit-enabled','ocf-script','platform','hwmon','monitor','',2,2,2,15,40);