From 4ef138fcf18345344efd79f7f783a4358faf3705 Mon Sep 17 00:00:00 2001 From: Kristine Bujold Date: Fri, 2 Aug 2019 13:32:39 -0400 Subject: [PATCH] Collapse the glance filesystem into platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The filesystem /opt/cgcs is removed and the “helm_charts” and “keystone” folders now resides under /opt/platform. ls /opt/platform/ armada config helm nfv puppet sysinv ls /opt/cgcs/ helm_charts keystone Resources related to cgcs-drbd and /opt/cgcs are removed from puppet. SMS is no longer monitoring these resources. Tested in AIO-SX, AIO-DX and Standard hardware labs. Depends-On: https://review.opendev.org/674360 Partial-Bug: 1830142 Change-Id: I4be7a877efb89bb9e5c2b067bdc7e4259f2b0c0c Signed-off-by: Kristine Bujold --- api-ref/source/api-ref-smapi-v1-ha.rst | 7 --- .../sm-db-1.0.0/centos/build_srpm.data | 2 +- .../sm-db-1.0.0/database/create_sm_db.sql | 51 +++---------------- 3 files changed, 9 insertions(+), 51 deletions(-) diff --git a/api-ref/source/api-ref-smapi-v1-ha.rst b/api-ref/source/api-ref-smapi-v1-ha.rst index 5f8ea699..ff2c08e9 100644 --- a/api-ref/source/api-ref-smapi-v1-ha.rst +++ b/api-ref/source/api-ref-smapi-v1-ha.rst @@ -177,13 +177,6 @@ itemNotFound (404) { "services":[ - { - "status":"", - "state":"enabled-active", - "id":5, - "desired_state":"enabled-active", - "name":"drbd-cgcs" - }, { "status":"", "state":"enabled-active", 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 7e7016d6..7b2efbf1 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=30 +TIS_PATCH_VER=31 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 36369e28..78954b0f 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 @@ -37,18 +37,14 @@ INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(1,'yes','oam-services','oam-ip','crit INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(2,'yes','controller-services','management-ip','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(3,'yes','controller-services','drbd-pg','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(4,'yes','controller-services','drbd-rabbit','critical'); -INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(5,'yes','controller-services','drbd-cgcs','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(6,'yes','controller-services','drbd-platform','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(7,'yes','controller-services','pg-fs','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(8,'yes','controller-services','rabbit-fs','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(9,'yes','controller-services','nfs-mgmt','critical'); -INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(10,'yes','controller-services','cgcs-fs','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(11,'yes','controller-services','platform-fs','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(12,'yes','controller-services','postgres','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(13,'yes','controller-services','rabbit','critical'); -INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(14,'yes','controller-services','cgcs-export-fs','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(15,'yes','controller-services','platform-export-fs','critical'); -INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(16,'yes','controller-services','cgcs-nfs-ip','critical'); INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(17,'yes','controller-services','platform-nfs-ip','critical'); 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'); @@ -103,18 +99,14 @@ INSERT INTO "SERVICES" VALUES(1,'yes','oam-ip','initial','initial','none','none' INSERT INTO "SERVICES" VALUES(2,'yes','management-ip','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(3,'yes','drbd-pg','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(4,'yes','drbd-rabbit','initial','initial','none','none',2,1,90000,4,16,''); -INSERT INTO "SERVICES" VALUES(5,'yes','drbd-cgcs','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(6,'yes','drbd-platform','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(7,'yes','pg-fs','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(8,'yes','rabbit-fs','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(9,'yes','nfs-mgmt','initial','initial','none','none',2,1,90000,4,16,''); -INSERT INTO "SERVICES" VALUES(10,'yes','cgcs-fs','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(11,'yes','platform-fs','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(12,'yes','postgres','initial','initial','none','none',2,1,90000,4,16,'/var/run/postmaster.pid'); INSERT INTO "SERVICES" VALUES(13,'yes','rabbit','initial','initial','none','none',2,1,90000,4,16,'/var/run/rabbitmq/rabbitmq.pid'); -INSERT INTO "SERVICES" VALUES(14,'yes','cgcs-export-fs','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(15,'yes','platform-export-fs','initial','initial','none','none',2,1,90000,4,16,''); -INSERT INTO "SERVICES" VALUES(16,'yes','cgcs-nfs-ip','initial','initial','none','none',2,1,90000,4,16,''); INSERT INTO "SERVICES" VALUES(17,'yes','platform-nfs-ip','initial','initial','none','none',2,1,90000,4,16,''); 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'); @@ -171,20 +163,16 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','haproxy','not-applicable','ena INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','enable','open-ldap','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-pg','not-applicable','go-active','management-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-rabbit','not-applicable','go-active','management-ip','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-cgcs','not-applicable','go-active','management-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-platform','not-applicable','go-active','management-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-extension','not-applicable','go-active','management-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','pg-fs','not-applicable','enable','drbd-pg','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit-fs','not-applicable','enable','drbd-rabbit','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-fs','not-applicable','enable','drbd-cgcs','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-fs','not-applicable','enable','drbd-platform','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','extension-fs','not-applicable','enable','drbd-extension','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','enable','pg-fs','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','enable','rabbit-fs','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-export-fs','not-applicable','enable','cgcs-fs','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-export-fs','not-applicable','enable','platform-fs','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','extension-export-fs','not-applicable','enable','extension-fs','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-nfs-ip','not-applicable','enable','cgcs-export-fs','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-nfs-ip','not-applicable','enable','platform-export-fs','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','sysinv-conductor','not-applicable','enable','postgres','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','sysinv-conductor','not-applicable','enable','rabbit','enabled-active'); @@ -204,30 +192,26 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','snmp','not-applicable','enable INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','etcd','not-applicable','enable','etcd-fs','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','keystone','not-applicable','enable','postgres','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','keystone','not-applicable','enable','rabbit','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','keystone','not-applicable','enable','cgcs-nfs-ip','enabled-active'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','keystone','not-applicable','enable','platform-nfs-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','horizon','not-applicable','enable','lighttpd','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceph-manager','not-applicable','enable','mgr-restful-plugin','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-cinder','not-applicable','go-active','management-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cinder-lvm','not-applicable','enable','drbd-cinder','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','iscsi','not-applicable','enable','cinder-lvm','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','iscsi','not-applicable','enable','cgcs-fs','enabled-active'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','iscsi','not-applicable','enable','platform-fs','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','oam-ip','not-applicable','disable','haproxy','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','disable','pg-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','disable','rabbit-fs','disabled'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','disable','cgcs-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','disable','platform-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-pg','not-applicable','go-standby','pg-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-rabbit','not-applicable','go-standby','rabbit-fs','disabled'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-cgcs','not-applicable','go-standby','cgcs-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-platform','not-applicable','go-standby','platform-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-extension','not-applicable','go-standby','extension-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','pg-fs','not-applicable','disable','postgres','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit-fs','not-applicable','disable','rabbit','disabled'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','nfs-mgmt','not-applicable','disable','cgcs-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','nfs-mgmt','not-applicable','disable','platform-fs','disabled'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-fs','not-applicable','disable','cgcs-export-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','extension-fs','not-applicable','disable','extension-export-fs','disabled'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-nfs-ip','not-applicable','disable','keystone','disabled'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-nfs-ip','not-applicable','disable','keystone','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-fs','not-applicable','disable','platform-export-fs','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','snmp','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','fm-mgr','disabled'); @@ -235,7 +219,6 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','di INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','sysinv-conductor','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','keystone','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','sysinv-conductor','disabled'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-export-fs','not-applicable','disable','cgcs-nfs-ip','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-export-fs','not-applicable','disable','platform-nfs-ip','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-nfs-ip','not-applicable','disable','sysinv-conductor','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','sysinv-conductor','not-applicable','disable','sysinv-inv','disabled'); @@ -250,7 +233,7 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','vim','not-applicable','disable INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dnsmasq','not-applicable','disable','',''); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','lighttpd','not-applicable','disable','horizon','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','mgr-restful-plugin','not-applicable','disable','ceph-manager','disabled'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-cgcs','not-applicable','disable','iscsi','disabled'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-platform','not-applicable','disable','iscsi','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','etcd-fs','not-applicable','disable','etcd','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cinder-lvm','not-applicable','disable','iscsi','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-cinder','not-applicable','go-standby','cinder-lvm','disabled'); @@ -350,12 +333,6 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-rabbit','go-active','ocf-script','lin INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-rabbit','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-rabbit','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-rabbit','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-cgcs','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-cgcs','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-cgcs','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-cgcs','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-cgcs','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-cgcs','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-platform','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-platform','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-platform','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,''); @@ -379,10 +356,6 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit-fs','audit-disabled','ocf-script',' INSERT INTO "SERVICE_ACTIONS" VALUES('nfs-mgmt','enable','ocf-script','platform','nfsserver-mgmt','start','',2,2,2,15,''); INSERT INTO "SERVICE_ACTIONS" VALUES('nfs-mgmt','disable','ocf-script','platform','nfsserver-mgmt','stop','',1,1,1,130,''); INSERT INTO "SERVICE_ACTIONS" VALUES('nfs-mgmt','audit-disabled','ocf-script','platform','nfsserver-mgmt','monitor','',0,0,0,15,40); -INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-fs','enable','ocf-script','heartbeat','Filesystem','start','',2,2,2,60,''); -INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-fs','disable','ocf-script','heartbeat','Filesystem','stop','',1,1,1,180,''); -INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-fs','audit-enabled','ocf-script','heartbeat','Filesystem','monitor','',2,2,2,60,40); -INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-fs','audit-disabled','ocf-script','heartbeat','Filesystem','monitor','',0,0,0,60,40); INSERT INTO "SERVICE_ACTIONS" VALUES('platform-fs','enable','ocf-script','heartbeat','Filesystem','start','',2,2,2,60,''); INSERT INTO "SERVICE_ACTIONS" VALUES('platform-fs','disable','ocf-script','heartbeat','Filesystem','stop','',1,1,1,180,''); INSERT INTO "SERVICE_ACTIONS" VALUES('platform-fs','audit-enabled','ocf-script','heartbeat','Filesystem','monitor','',2,2,2,60,40); @@ -399,10 +372,6 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','enable','ocf-script','rabbitmq',' 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); -INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-export-fs','audit-disabled','ocf-script','heartbeat','exportfs','monitor','',0,0,0,20,30); INSERT INTO "SERVICE_ACTIONS" VALUES('platform-export-fs','enable','ocf-script','heartbeat','exportfs','start','',2,2,2,40,''); INSERT INTO "SERVICE_ACTIONS" VALUES('platform-export-fs','disable','ocf-script','heartbeat','exportfs','stop','',1,1,1,15,''); INSERT INTO "SERVICE_ACTIONS" VALUES('platform-export-fs','audit-enabled','ocf-script','heartbeat','exportfs','monitor','',2,2,2,20,30); @@ -411,10 +380,6 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('extension-export-fs','enable','ocf-script' INSERT INTO "SERVICE_ACTIONS" VALUES('extension-export-fs','disable','ocf-script','heartbeat','exportfs','stop','',1,1,1,15,''); INSERT INTO "SERVICE_ACTIONS" VALUES('extension-export-fs','audit-enabled','ocf-script','heartbeat','exportfs','monitor','',2,2,2,20,30); INSERT INTO "SERVICE_ACTIONS" VALUES('extension-export-fs','audit-disabled','ocf-script','heartbeat','exportfs','monitor','',0,0,0,20,30); -INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-nfs-ip','enable','ocf-script','heartbeat','IPaddr2','start','',2,2,2,20,''); -INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-nfs-ip','disable','ocf-script','heartbeat','IPaddr2','stop','',1,1,1,20,''); -INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-nfs-ip','audit-enabled','ocf-script','heartbeat','IPaddr2','monitor','',2,2,2,20,5); -INSERT INTO "SERVICE_ACTIONS" VALUES('cgcs-nfs-ip','audit-disabled','ocf-script','heartbeat','IPaddr2','monitor','',0,0,0,20,5); INSERT INTO "SERVICE_ACTIONS" VALUES('platform-nfs-ip','enable','ocf-script','heartbeat','IPaddr2','start','',2,2,2,20,''); INSERT INTO "SERVICE_ACTIONS" VALUES('platform-nfs-ip','disable','ocf-script','heartbeat','IPaddr2','stop','',1,1,1,20,''); INSERT INTO "SERVICE_ACTIONS" VALUES('platform-nfs-ip','audit-enabled','ocf-script','heartbeat','IPaddr2','monitor','',2,2,2,20,5); @@ -658,8 +623,8 @@ INSERT INTO "CONFIGURATION" ("KEY", "VALUE") VALUES("sm_server_port", ""); -- 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 "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 "SERVICE_DEPENDENCY" VALUES('action','docker-distribution','not-applicable','enable','cgcs-fs','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-fs','not-applicable','disable','docker-distribution','disabled'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','docker-distribution','not-applicable','enable','platform-fs','enabled-active'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-fs','not-applicable','disable','docker-distribution','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','docker-distribution','not-applicable','enable','management-ip','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','management-ip','not-applicable','disable','docker-distribution','disabled'); INSERT INTO "SERVICE_ACTIONS" VALUES('docker-distribution','enable','lsb-script','','docker-distribution','start','',2,2,2,15,''); @@ -723,8 +688,8 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('ceph-osd','audit-disabled','lsb-script','' INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'no','controller-services','helmrepository-fs','critical' FROM "SERVICE_GROUP_MEMBERS"; INSERT INTO "SERVICES" SELECT MAX(id) + 1,'no','helmrepository-fs','initial','initial','none','none',2,1,90000,4,16,'' FROM "SERVICES"; -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','helmrepository-fs','not-applicable','enable','cgcs-fs','enabled-active'); -INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-fs','not-applicable','disable','helmrepository-fs','disabled'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','helmrepository-fs','not-applicable','enable','platform-fs','enabled-active'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-fs','not-applicable','disable','helmrepository-fs','disabled'); INSERT INTO "SERVICE_ACTIONS" VALUES('helmrepository-fs','enable','ocf-script','heartbeat','Filesystem','start','',2,2,2,60,''); INSERT INTO "SERVICE_ACTIONS" VALUES('helmrepository-fs','disable','ocf-script','heartbeat','Filesystem','stop','',1,1,1,180,''); INSERT INTO "SERVICE_ACTIONS" VALUES('helmrepository-fs','audit-enabled','ocf-script','heartbeat','Filesystem','monitor','',2,2,2,60,40);