starlingx
/
ha
Code Issues Proposed changes

SM management for Barbican in HA environment. 

Add Barbican processes into SM database for its management in HA.
SM will be able to manage Barbican processes via an OCF scripts.
 Barbican processes are: api, worker and keystone-listener).

Change-Id: I1d037b2051dd9febf3d73efe4032b957ab32c187
Story: 2003108
Task: 27700
Depends-On: I6b0b0c90456627bebde2b834b339bc968100b6f9
Signed-off-by: Alex Kozyrev <alex.kozyrev@windriver.com>
This commit is contained in:
Alex Kozyrev 2018-11-29 10:55:23 -05:00
parent d7ba498da9
commit 2ef5e82555
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service-mgmt/sm-db-1.0.0/centos/build_srpm.data
View File

@ -2,4 +2,4 @@ SRC_DIR=`pwd`
COPY_LIST="$PKG_BASE/LICENSE"
TAR_NAME=sm-db
VERSION=1.0.0
TIS_PATCH_VER=26
TIS_PATCH_VER=27

26
service-mgmt/sm-db-1.0.0/database/create_sm_db.sql
View File

@ -127,6 +127,9 @@ INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(98,'no','distributed-cloud-services',
INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(99,'yes','controller-services','etcd','critical');
INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','controller-services','drbd-etcd','critical' FROM "SERVICE_GROUP_MEMBERS";
INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','controller-services','etcd-fs','critical' FROM "SERVICE_GROUP_MEMBERS";
INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'yes','cloud-services','barbican-api','critical' FROM "SERVICE_GROUP_MEMBERS";
INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'yes','cloud-services','barbican-keystone-listener','critical' FROM "SERVICE_GROUP_MEMBERS";
INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'yes','cloud-services','barbican-worker','critical' FROM "SERVICE_GROUP_MEMBERS";
CREATE TABLE SERVICES ( ID INTEGER PRIMARY KEY AUTOINCREMENT, PROVISIONED CHAR(32), NAME CHAR(32), DESIRED_STATE CHAR(32), STATE CHAR(32), STATUS CHAR(32), CONDITION CHAR(32), MAX_FAILURES INT, FAIL_COUNTDOWN INT, FAIL_COUNTDOWN_INTERVAL INT, MAX_ACTION_FAILURES INT, MAX_TRANSITION_FAILURES INT, PID_FILE CHAR(256) );
INSERT INTO "SERVICES" VALUES(1,'yes','oam-ip','initial','initial','none','none',2,1,90000,4,16,'');
INSERT INTO "SERVICES" VALUES(2,'yes','management-ip','initial','initial','none','none',2,1,90000,4,16,'');
@ -222,6 +225,9 @@ INSERT INTO "SERVICES" VALUES(98,'no','dcorch-identity-api-proxy','initial','ini
INSERT INTO "SERVICES" VALUES(99,'yes','etcd','initial','initial','none','none',2,1,90000,4,16,'/var/run/etcd.pid');
INSERT INTO "SERVICES" SELECT MAX(id) + 1,'no','drbd-etcd','initial','initial','none','none',2,1,90000,4,16,'' FROM "SERVICES";
INSERT INTO "SERVICES" SELECT MAX(id) + 1,'no','etcd-fs','initial','initial','none','none',2,1,90000,4,16,'' FROM "SERVICES";
INSERT INTO "SERVICES" SELECT MAX(id) + 1,'yes','barbican-api','initial','initial','none','none',2,1,90000,4,16,'/var/run/barbican/pid' FROM "SERVICES";
INSERT INTO "SERVICES" SELECT MAX(id) + 1,'yes','barbican-keystone-listener','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/barbican-keystone-listener.pid' FROM "SERVICES";
INSERT INTO "SERVICES" SELECT MAX(id) + 1,'yes','barbican-worker','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/barbican-worker.pid' FROM "SERVICES";
CREATE TABLE SERVICE_HEARTBEAT ( ID INTEGER PRIMARY KEY AUTOINCREMENT, PROVISIONED CHAR(32), NAME CHAR(32), TYPE CHAR(32), SRC_ADDRESS CHAR(256), SRC_PORT INT, DST_ADDRESS CHAR(256), DST_PORT INT, MESSAGE CHAR(256), INTERVAL_IN_MS INT, MISSED_WARN INT, MISSED_DEGRADE INT, MISSED_FAIL INT, STATE CHAR(32), MISSED INT, HEARTBEAT_TIMER_ID INT, HEARTBEAT_SOCKET INT );
CREATE TABLE SERVICE_DEPENDENCY ( DEPENDENCY_TYPE CHAR(32), SERVICE_NAME CHAR(32), STATE CHAR(32), ACTION CHAR(32), DEPENDENT CHAR(32), DEPENDENT_STATE CHAR(32), PRIMARY KEY (DEPENDENCY_TYPE, SERVICE_NAME, STATE, ACTION, DEPENDENT));
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','oam-ip','not-applicable','enable','management-ip','enabled-active');
@ -496,6 +502,14 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcmanager-manager','not-applic
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-etcd','not-applicable','go-active','management-ip','enabled-active');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','etcd-fs','not-applicable','enable','drbd-etcd','enabled-active');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-etcd','not-applicable','go-standby','etcd-fs','disabled');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','barbican-api','not-applicable','enable','postgres','enabled-active');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','barbican-api','not-applicable','enable','rabbit','enabled-active');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','barbican-worker','not-applicable','enable','barbican-api','enabled-active');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','barbican-keystone-listener','not-applicable','enable','barbican-worker','enabled-active');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','barbican-api','disabled');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','barbican-api','disabled');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','barbican-api','not-applicable','disable','barbican-worker','disabled');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','barbican-worker','not-applicable','disable','barbican-keystone-listener','disabled');
CREATE TABLE SERVICE_INSTANCES ( ID INTEGER PRIMARY KEY AUTOINCREMENT, SERVICE_NAME CHAR(32), INSTANCE_NAME CHAR(32), INSTANCE_PARAMETERS CHAR(1024) );
INSERT INTO "SERVICE_INSTANCES" VALUES(1,'lighttpd','lighttpd','');
INSERT INTO "SERVICE_INSTANCES" VALUES(2,'horizon','horizon','');
@ -903,6 +917,18 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('etcd-fs','enable','ocf-script','heartbeat'
INSERT INTO "SERVICE_ACTIONS" VALUES('etcd-fs','disable','ocf-script','heartbeat','Filesystem','stop','',1,1,1,180,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('etcd-fs','audit-enabled','ocf-script','heartbeat','Filesystem','monitor','',2,2,2,60,40);
INSERT INTO "SERVICE_ACTIONS" VALUES('etcd-fs','audit-disabled','ocf-script','heartbeat','Filesystem','monitor','',0,0,0,60,40);
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-api','enable','ocf-script','openstack','barbican-api','start','',2,2,2,20,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-api','disable','ocf-script','openstack','barbican-api','stop','',1,1,1,20,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-api','audit-enabled','ocf-script','openstack','barbican-api','monitor','',2,2,2,30,30);
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-api','audit-disabled','ocf-script','openstack','barbican-api','monitor','',0,0,0,30,30);
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-keystone-listener','enable','ocf-script','openstack','barbican-keystone-listener','start','',2,2,2,20,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-keystone-listener','disable','ocf-script','openstack','barbican-keystone-listener','stop','',1,1,1,20,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-keystone-listener','audit-enabled','ocf-script','openstack','barbican-keystone-listener','monitor','',2,2,2,30,30);
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-keystone-listener','audit-disabled','ocf-script','openstack','barbican-keystone-listener','monitor','',0,0,0,30,30);
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-worker','enable','ocf-script','openstack','barbican-worker','start','',2,2,2,20,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-worker','disable','ocf-script','openstack','barbican-worker','stop','',1,1,1,20,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-worker','audit-enabled','ocf-script','openstack','barbican-worker','monitor','',2,2,2,30,30);
INSERT INTO "SERVICE_ACTIONS" VALUES('barbican-worker','audit-disabled','ocf-script','openstack','barbican-worker','monitor','',0,0,0,30,30);
CREATE TABLE SERVICE_ACTION_RESULTS ( PLUGIN_TYPE CHAR(32), PLUGIN_NAME CHAR(80), PLUGIN_COMMAND CHAR(80), PLUGIN_EXIT_CODE CHAR(10), ACTION_RESULT CHAR(32), SERVICE_STATE CHAR(32), SERVICE_STATUS CHAR(32), SERVICE_CONDITION CHAR(32), PRIMARY KEY (PLUGIN_TYPE, PLUGIN_NAME, PLUGIN_COMMAND, PLUGIN_EXIT_CODE));
INSERT INTO "SERVICE_ACTION_RESULTS" VALUES('lsb-script','default','status','0','success','enabled-active','unknown','unknown');
INSERT INTO "SERVICE_ACTION_RESULTS" VALUES('lsb-script','default','status','1','success','disabled','unknown','unknown');