starlingx/ha
Code Issues Proposed changes

Rename the existing /opt/patch-vault filesystem to /opt/dc-vault

Browse Source 
The filesystem /opt/patch-vault is renamed to /opt/dc-vault so that
it can be re-used to store FPGA images and software loads. Thus,
the SM services have been renamed from drbd-patch-vault and
patch-vault-fs to drbd-dc-vault and dc-vault-fs.

Change-Id: Ifeed62ad86f043b5b2d9602cbfffa0ea95f2c685
Story: 2006740
Task: 39550
Depends-On: https://review.opendev.org/#/c/723007/
Signed-off-by: Jessica Castelino <jessica.castelino@windriver.com>
This commit is contained in:
Jessica Castelino 2020-04-24 14:47:04 -04:00
parent 209e062848
commit a5f4a8e97a
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,8 +80,8 @@ INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(91,'no','distributed-cloud-services',
INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(92,'no','distributed-cloud-services','dcorch-nova-api-proxy','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(92,'no','distributed-cloud-services','dcorch-nova-api-proxy','critical');
INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(93,'no','distributed-cloud-services','dcorch-neutron-api-proxy','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(93,'no','distributed-cloud-services','dcorch-neutron-api-proxy','critical');
INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(94,'no','distributed-cloud-services','dcorch-cinder-api-proxy','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(94,'no','distributed-cloud-services','dcorch-cinder-api-proxy','critical');
INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(95,'no','controller-services','drbd-patch-vault','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(95,'no','controller-services','drbd-dc-vault','critical');
INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(96,'no','controller-services','patch-vault-fs','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(96,'no','controller-services','dc-vault-fs','critical');
INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(97,'no','distributed-cloud-services','dcorch-patch-api-proxy','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(97,'no','distributed-cloud-services','dcorch-patch-api-proxy','critical');
INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(98,'no','distributed-cloud-services','dcorch-identity-api-proxy','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(98,'no','distributed-cloud-services','dcorch-identity-api-proxy','critical');
INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(99,'yes','controller-services','etcd','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(99,'yes','controller-services','etcd','critical');
@ -142,8 +142,8 @@ INSERT INTO "SERVICES" VALUES(91,'no','dcorch-sysinv-api-proxy','initial','initi
INSERT INTO "SERVICES" VALUES(92,'no','dcorch-nova-api-proxy','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/dcorch-nova-api-proxy.pid'); INSERT INTO "SERVICES" VALUES(92,'no','dcorch-nova-api-proxy','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/dcorch-nova-api-proxy.pid');
INSERT INTO "SERVICES" VALUES(93,'no','dcorch-neutron-api-proxy','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/dcorch-neutron-api-proxy.pid'); INSERT INTO "SERVICES" VALUES(93,'no','dcorch-neutron-api-proxy','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/dcorch-neutron-api-proxy.pid');
INSERT INTO "SERVICES" VALUES(94,'no','dcorch-cinder-api-proxy','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/dcorch-cinder-api-proxy.pid'); INSERT INTO "SERVICES" VALUES(94,'no','dcorch-cinder-api-proxy','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/dcorch-cinder-api-proxy.pid');
INSERT INTO "SERVICES" VALUES(95,'no','drbd-patch-vault','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(95,'no','drbd-dc-vault','initial','initial','none','none',2,1,90000,4,16,'');
INSERT INTO "SERVICES" VALUES(96,'no','patch-vault-fs','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(96,'no','dc-vault-fs','initial','initial','none','none',2,1,90000,4,16,'');
INSERT INTO "SERVICES" VALUES(97,'no','dcorch-patch-api-proxy','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/dcorch-patch-api-proxy.pid'); INSERT INTO "SERVICES" VALUES(97,'no','dcorch-patch-api-proxy','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/dcorch-patch-api-proxy.pid');
INSERT INTO "SERVICES" VALUES(98,'no','dcorch-identity-api-proxy','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/dcorch-identity-api-proxy.pid'); INSERT INTO "SERVICES" VALUES(98,'no','dcorch-identity-api-proxy','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/dcorch-identity-api-proxy.pid');
INSERT INTO "SERVICES" VALUES(99,'yes','etcd','initial','initial','none','none',2,1,90000,4,16,'/var/run/etcd.pid'); INSERT INTO "SERVICES" VALUES(99,'yes','etcd','initial','initial','none','none',2,1,90000,4,16,'/var/run/etcd.pid');
@ -271,9 +271,9 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcorch-neutron-api-proxy','not
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcorch-engine','not-applicable','disable','dcorch-neutron-api-proxy','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcorch-engine','not-applicable','disable','dcorch-neutron-api-proxy','disabled');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcorch-cinder-api-proxy','not-applicable','enable','dcorch-engine','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcorch-cinder-api-proxy','not-applicable','enable','dcorch-engine','enabled-active');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcorch-engine','not-applicable','disable','dcorch-cinder-api-proxy','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcorch-engine','not-applicable','disable','dcorch-cinder-api-proxy','disabled');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-patch-vault','not-applicable','go-active','management-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-dc-vault','not-applicable','go-active','management-ip','enabled-active');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','patch-vault-fs','not-applicable','enable','drbd-patch-vault','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dc-vault-fs','not-applicable','enable','drbd-dc-vault','enabled-active');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-patch-vault','not-applicable','go-standby','patch-vault-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-dc-vault','not-applicable','go-standby','dc-vault-fs','disabled');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcorch-patch-api-proxy','not-applicable','enable','dcmanager-manager','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcorch-patch-api-proxy','not-applicable','enable','dcmanager-manager','enabled-active');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcmanager-manager','not-applicable','disable','dcorch-patch-api-proxy','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dcmanager-manager','not-applicable','disable','dcorch-patch-api-proxy','disabled');
INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-etcd','not-applicable','go-active','management-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-etcd','not-applicable','go-active','management-ip','enabled-active');
@ -515,16 +515,16 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-cinder-api-proxy','enable','ocf-scr
INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-cinder-api-proxy','disable','ocf-script','openstack','dcorch-cinder-api-proxy','stop','',1,1,1,20,''); INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-cinder-api-proxy','disable','ocf-script','openstack','dcorch-cinder-api-proxy','stop','',1,1,1,20,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-cinder-api-proxy','audit-enabled','ocf-script','openstack','dcorch-cinder-api-proxy','monitor','',2,2,2,20,5); INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-cinder-api-proxy','audit-enabled','ocf-script','openstack','dcorch-cinder-api-proxy','monitor','',2,2,2,20,5);
INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-cinder-api-proxy','audit-disabled','ocf-script','openstack','dcorch-cinder-api-proxy','monitor','',0,0,0,20,5); INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-cinder-api-proxy','audit-disabled','ocf-script','openstack','dcorch-cinder-api-proxy','monitor','',0,0,0,20,5);
INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-patch-vault','enable','ocf-script','linbit','drbd','start','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',2,2,2,90,''); INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-dc-vault','enable','ocf-script','linbit','drbd','start','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',2,2,2,90,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-patch-vault','disable','ocf-script','linbit','drbd','stop','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',1,1,1,180,''); INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-dc-vault','disable','ocf-script','linbit','drbd','stop','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',1,1,1,180,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-patch-vault','go-active','ocf-script','linbit','drbd','promote','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',2,2,2,180,''); INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-dc-vault','go-active','ocf-script','linbit','drbd','promote','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',2,2,2,180,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-patch-vault','go-standby','ocf-script','linbit','drbd','demote','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',2,2,2,180,''); INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-dc-vault','go-standby','ocf-script','linbit','drbd','demote','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',2,2,2,180,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-patch-vault','audit-enabled','ocf-script','linbit','drbd','monitor','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',2,2,2,20,30); INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-dc-vault','audit-enabled','ocf-script','linbit','drbd','monitor','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',2,2,2,20,30);
INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-patch-vault','audit-disabled','ocf-script','linbit','drbd','monitor','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',0,0,0,20,28); INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-dc-vault','audit-disabled','ocf-script','linbit','drbd','monitor','master_max=1,master_node_max=1,clone_max=2,clone_node_max=1,notify=true,globally_unique=false',0,0,0,20,28);
INSERT INTO "SERVICE_ACTIONS" VALUES('patch-vault-fs','enable','ocf-script','heartbeat','Filesystem','start','',2,2,2,60,''); INSERT INTO "SERVICE_ACTIONS" VALUES('dc-vault-fs','enable','ocf-script','heartbeat','Filesystem','start','',2,2,2,60,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('patch-vault-fs','disable','ocf-script','heartbeat','Filesystem','stop','',1,1,1,180,''); INSERT INTO "SERVICE_ACTIONS" VALUES('dc-vault-fs','disable','ocf-script','heartbeat','Filesystem','stop','',1,1,1,180,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('patch-vault-fs','audit-enabled','ocf-script','heartbeat','Filesystem','monitor','',2,2,2,60,40); INSERT INTO "SERVICE_ACTIONS" VALUES('dc-vault-fs','audit-enabled','ocf-script','heartbeat','Filesystem','monitor','',2,2,2,60,40);
INSERT INTO "SERVICE_ACTIONS" VALUES('patch-vault-fs','audit-disabled','ocf-script','heartbeat','Filesystem','monitor','',0,0,0,60,40); INSERT INTO "SERVICE_ACTIONS" VALUES('dc-vault-fs','audit-disabled','ocf-script','heartbeat','Filesystem','monitor','',0,0,0,60,40);
INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-patch-api-proxy','enable','ocf-script','openstack','dcorch-patch-api-proxy','start','',2,2,2,20,''); INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-patch-api-proxy','enable','ocf-script','openstack','dcorch-patch-api-proxy','start','',2,2,2,20,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-patch-api-proxy','disable','ocf-script','openstack','dcorch-patch-api-proxy','stop','',1,1,1,20,''); INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-patch-api-proxy','disable','ocf-script','openstack','dcorch-patch-api-proxy','stop','',1,1,1,20,'');
INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-patch-api-proxy','audit-enabled','ocf-script','openstack','dcorch-patch-api-proxy','monitor','',2,2,2,20,5); INSERT INTO "SERVICE_ACTIONS" VALUES('dcorch-patch-api-proxy','audit-enabled','ocf-script','openstack','dcorch-patch-api-proxy','monitor','',2,2,2,20,5);
@ -617,7 +617,7 @@ INSERT INTO "CONFIGURATION" VALUES(1,'ENABLING_THROTTLE','2');
INSERT INTO "CONFIGURATION" ("KEY", "VALUE") VALUES("sm_client_port", ""); INSERT INTO "CONFIGURATION" ("KEY", "VALUE") VALUES("sm_client_port", "");
INSERT INTO "CONFIGURATION" ("KEY", "VALUE") VALUES("sm_server_port", ""); INSERT INTO "CONFIGURATION" ("KEY", "VALUE") VALUES("sm_server_port", "");
-- to add new service or service member, follow the examples below, avoid using a hardcoded id -- to add new service or service member, follow the examples below, avoid using a hardcoded id
-- INSERT INTO "SERVICES" SELECT MAX(id) + 1,'no','drbd-patch-vault','initial','initial','none','none',2,1,90000,4,16,'' FROM "SERVICES"; -- INSERT INTO "SERVICES" SELECT MAX(id) + 1,'no','drbd-dc-vault','initial','initial','none','none',2,1,90000,4,16,'' FROM "SERVICES";
-- INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','distributed-cloud-services','dcorch-nova-api-proxy','critical' FROM "SERVICE_GROUP_MEMBERS"; -- INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','distributed-cloud-services','dcorch-nova-api-proxy','critical' FROM "SERVICE_GROUP_MEMBERS";
INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','controller-services','docker-distribution','critical' FROM "SERVICE_GROUP_MEMBERS"; INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','controller-services','docker-distribution','critical' FROM "SERVICE_GROUP_MEMBERS";
INSERT INTO "SERVICES" SELECT MAX(id) + 1, 'no','docker-distribution','initial','initial','none','none',2,1,90000,4,16,'/var/run/docker-distribution.pid' FROM "SERVICES"; INSERT INTO "SERVICES" SELECT MAX(id) + 1, 'no','docker-distribution','initial','initial','none','none',2,1,90000,4,16,'/var/run/docker-distribution.pid' FROM "SERVICES";