Browse Source

Manage gnocchi services in SM

Remove ceilometer services and add gnocchi services in SM.

Change-Id: I5cc7b5c4782c557196a8360456540eb907362c7c
Signed-off-by: Don Penney <don.penney@windriver.com>
Signed-off-by: Jack Ding <jack.ding@windriver.com>
tags/2018.08.0
Angie Wang 11 months ago
parent
commit
b7d84691a0
1 changed files with 26 additions and 25 deletions
  1. 26
    25
      service-mgmt/sm-db-1.0.0/database/create_sm_db.sql

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

@@ -70,8 +70,6 @@ INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(35,'yes','cloud-services','nova-novnc
70 70
 INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(36,'yes','cloud-services','cinder-api','critical');
71 71
 INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(37,'yes','cloud-services','cinder-scheduler','critical');
72 72
 INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(38,'yes','cloud-services','cinder-volume','critical');
73
-INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(40,'yes','cloud-services','ceilometer-collector','critical');
74
-INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(41,'yes','cloud-services','ceilometer-api','critical');
75 73
 INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(44,'yes','cloud-services','ceilometer-agent-notification','critical');
76 74
 INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(45,'yes','cloud-services','heat-engine','critical');
77 75
 INSERT INTO "SERVICE_GROUP_MEMBERS" VALUES(46,'yes','cloud-services','heat-api','critical');
@@ -166,8 +164,6 @@ INSERT INTO "SERVICES" VALUES(34,'yes','nova-novnc','initial','initial','none','
166 164
 INSERT INTO "SERVICES" VALUES(35,'yes','cinder-api','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/cinder-api.pid');
167 165
 INSERT INTO "SERVICES" VALUES(36,'yes','cinder-scheduler','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/cinder-scheduler.pid');
168 166
 INSERT INTO "SERVICES" VALUES(37,'yes','cinder-volume','initial','initial','none','none',32,16,180000,4,16,'/var/run/resource-agents/cinder-volume.pid');
169
-INSERT INTO "SERVICES" VALUES(39,'yes','ceilometer-collector','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/ceilometer-collector.pid');
170
-INSERT INTO "SERVICES" VALUES(40,'yes','ceilometer-api','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/ceilometer-api.pid');
171 167
 INSERT INTO "SERVICES" VALUES(43,'yes','ceilometer-agent-notification','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/ceilometer-agent-notification.pid');
172 168
 INSERT INTO "SERVICES" VALUES(44,'yes','heat-engine','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/heat-engine.pid');
173 169
 INSERT INTO "SERVICES" VALUES(45,'yes','heat-api','initial','initial','none','none',2,1,90000,4,16,'/var/run/resource-agents/heat-api.pid');
@@ -295,11 +291,7 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cinder-volume','not-applicable
295 291
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cinder-volume','not-applicable','enable','cgcs-nfs-ip','enabled-active');
296 292
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cinder-api','not-applicable','enable','cinder-scheduler','enabled-active');
297 293
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cinder-api','not-applicable','enable','cinder-volume','enabled-active');
298
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-collector','not-applicable','enable','postgres','enabled-active');
299
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-collector','not-applicable','enable','rabbit','enabled-active');
300
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-collector','not-applicable','enable','cgcs-nfs-ip','enabled-active');
301
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-api','not-applicable','enable','ceilometer-collector','enabled-active');
302
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-agent-notification','not-applicable','enable','ceilometer-api','enabled-active');
294
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-agent-notification','not-applicable','enable','rabbit','enabled-active');
303 295
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','heat-engine','not-applicable','enable','postgres','enabled-active');
304 296
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','heat-engine','not-applicable','enable','rabbit','enabled-active');
305 297
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','heat-engine','not-applicable','enable','cgcs-nfs-ip','enabled-active');
@@ -338,7 +330,6 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-nfs-ip','not-applicable',
338 330
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-nfs-ip','not-applicable','disable','nova-console-auth','disabled');
339 331
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-nfs-ip','not-applicable','disable','cinder-scheduler','disabled');
340 332
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-nfs-ip','not-applicable','disable','cinder-volume','disabled');
341
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-nfs-ip','not-applicable','disable','ceilometer-collector','disabled');
342 333
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-nfs-ip','not-applicable','disable','heat-engine','disabled');
343 334
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','platform-fs','not-applicable','disable','platform-export-fs','disabled');
344 335
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','snmp','disabled');
@@ -351,7 +342,6 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','di
351 342
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','nova-console-auth','disabled');
352 343
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','cinder-scheduler','disabled');
353 344
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','cinder-volume','disabled');
354
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','ceilometer-collector','disabled');
355 345
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','heat-engine','disabled');
356 346
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','sysinv-conductor','disabled');
357 347
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','keystone','disabled');
@@ -362,7 +352,7 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disa
362 352
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','nova-console-auth','disabled');
363 353
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','cinder-scheduler','disabled');
364 354
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','cinder-volume','disabled');
365
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','ceilometer-collector','disabled');
355
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','ceilometer-agent-notification','disabled');
366 356
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','heat-engine','disabled');
367 357
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','rabbit','not-applicable','disable','sysinv-conductor','disabled');
368 358
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-export-fs','not-applicable','disable','cgcs-nfs-ip','disabled');
@@ -385,8 +375,6 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','nova-conductor','not-applicabl
385 375
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','nova-api','not-applicable','disable','nova-api-proxy','disabled');
386 376
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cinder-scheduler','not-applicable','disable','cinder-api','disabled');
387 377
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cinder-volume','not-applicable','disable','cinder-api','disabled');
388
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-collector','not-applicable','disable','ceilometer-api','disabled');
389
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-api','not-applicable','disable','ceilometer-agent-notification','disabled');
390 378
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','heat-engine','not-applicable','disable','heat-api','disabled');
391 379
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','heat-api','not-applicable','disable','heat-api-cfn','disabled');
392 380
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','heat-api-cfn','not-applicable','disable','heat-api-cloudwatch','disabled');
@@ -425,8 +413,8 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','murano-rabbit','not-applicable
425 413
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','murano-api','not-applicable','enable','murano-rabbit','enabled-active');
426 414
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','murano-rabbit','not-applicable','disable','murano-api','disabled');
427 415
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','snmp','not-applicable','enable','dnsmasq','enabled-active');
428
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','panko-api','not-applicable','enable','ceilometer-collector','enabled-active');
429
-INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-collector','not-applicable','disable','panko-api','disabled');
416
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','panko-api','not-applicable','enable','ceilometer-agent-notification','enabled-active');
417
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-agent-notification','not-applicable','disable','panko-api','disabled');
430 418
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','magnum-conductor','not-applicable','enable','magnum-api','enabled-active');
431 419
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','magnum-api','not-applicable','disable','magnum-conductor','disabled');
432 420
 INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','magnum-conductor','not-applicable','enable','postgres','enabled-active');
@@ -686,14 +674,6 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('cinder-volume','enable','ocf-script','open
686 674
 INSERT INTO "SERVICE_ACTIONS" VALUES('cinder-volume','disable','ocf-script','openstack','cinder-volume','stop','',1,1,1,20,'');
687 675
 INSERT INTO "SERVICE_ACTIONS" VALUES('cinder-volume','audit-enabled','ocf-script','openstack','cinder-volume','monitor','',2,2,2,30,60);
688 676
 INSERT INTO "SERVICE_ACTIONS" VALUES('cinder-volume','audit-disabled','ocf-script','openstack','cinder-volume','monitor','',0,0,0,30,20);
689
-INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-collector','enable','ocf-script','openstack','ceilometer-collector','start','',2,2,2,20,'');
690
-INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-collector','disable','ocf-script','openstack','ceilometer-collector','stop','',1,1,1,20,'');
691
-INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-collector','audit-enabled','ocf-script','openstack','ceilometer-collector','monitor','',2,2,2,30,30);
692
-INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-collector','audit-disabled','ocf-script','openstack','ceilometer-collector','monitor','',0,0,0,30,30);
693
-INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-api','enable','ocf-script','openstack','ceilometer-api','start','',2,2,2,20,'');
694
-INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-api','disable','ocf-script','openstack','ceilometer-api','stop','',1,1,1,20,'');
695
-INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-api','audit-enabled','ocf-script','openstack','ceilometer-api','monitor','',2,2,2,30,30);
696
-INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-api','audit-disabled','ocf-script','openstack','ceilometer-api','monitor','',0,0,0,30,30);
697 677
 INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-agent-notification','enable','ocf-script','openstack','ceilometer-agent-notification','start','',2,2,2,20,'');
698 678
 INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-agent-notification','disable','ocf-script','openstack','ceilometer-agent-notification','stop','',1,1,1,20,'');
699 679
 INSERT INTO "SERVICE_ACTIONS" VALUES('ceilometer-agent-notification','audit-enabled','ocf-script','openstack','ceilometer-agent-notification','monitor','',2,2,2,30,30);
@@ -999,5 +979,26 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-dockerdistribution','audit-enabled','
999 979
 INSERT INTO "SERVICE_ACTIONS" VALUES('drbd-dockerdistribution','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);
1000 980
 
1001 981
 update "SERVICE_ACTIONS" set TIMEOUT_IN_SECS=60 where action in ('enable', 'audit-enabled') and service_name = 'glance-registry';
1002
-
982
+INSERT INTO "SERVICES" SELECT MAX(id) + 1,'yes','gnocchi-api','initial','initial','none','none',2,1,90000,4,16,'/var/run/gnocchi-api.pid' FROM "SERVICES";
983
+INSERT INTO "SERVICES" SELECT MAX(id) + 1,'yes','gnocchi-metricd','initial','initial','none','none',2,1,90000,4,16,'/var/run/gnocchi-metricd.pid' FROM "SERVICES";
984
+INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'yes','cloud-services','gnocchi-api','critical' FROM "SERVICE_GROUP_MEMBERS";
985
+INSERT INTO "SERVICE_GROUP_MEMBERS" SELECT MAX(id) + 1,'yes','cloud-services','gnocchi-metricd','critical' FROM "SERVICE_GROUP_MEMBERS";
986
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','gnocchi-api','not-applicable','enable','postgres','enabled-active');
987
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','gnocchi-api','not-applicable','enable','cgcs-nfs-ip','enabled-active');
988
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','gnocchi-api','not-applicable','enable','drbd-cgcs','enabled-active');
989
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','gnocchi-metricd','not-applicable','enable','gnocchi-api','enabled-active');
990
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','ceilometer-agent-notification','not-applicable','enable','gnocchi-api','enabled-active');
991
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','postgres','not-applicable','disable','gnocchi-api','disabled');
992
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','cgcs-nfs-ip','not-applicable','disable','gnocchi-api','disabled');
993
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','drbd-cgcs','not-applicable','disable','gnocchi-api','disabled');
994
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','gnocchi-api','not-applicable','disable','gnocchi-metricd','disabled');
995
+INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','gnocchi-api','not-applicable','disable','ceilometer-agent-notification','disabled');
996
+INSERT INTO "SERVICE_ACTIONS" VALUES('gnocchi-api','enable','lsb-script','','gnocchi-api','start','',2,2,2,20,'');
997
+INSERT INTO "SERVICE_ACTIONS" VALUES('gnocchi-api','disable','lsb-script','','gnocchi-api','stop','',1,1,1,20,'');
998
+INSERT INTO "SERVICE_ACTIONS" VALUES('gnocchi-api','audit-enabled','lsb-script','','gnocchi-api','status','',2,2,2,30,30);
999
+INSERT INTO "SERVICE_ACTIONS" VALUES('gnocchi-api','audit-disabled','lsb-script','','gnocchi-api','status','',0,0,0,30,30);
1000
+INSERT INTO "SERVICE_ACTIONS" VALUES('gnocchi-metricd','enable','lsb-script','','gnocchi-metricd','start','',2,2,2,20,'');
1001
+INSERT INTO "SERVICE_ACTIONS" VALUES('gnocchi-metricd','disable','lsb-script','','gnocchi-metricd','stop','',1,1,1,20,'');
1002
+INSERT INTO "SERVICE_ACTIONS" VALUES('gnocchi-metricd','audit-enabled','lsb-script','','gnocchi-metricd','status','',2,2,2,30,30);
1003
+INSERT INTO "SERVICE_ACTIONS" VALUES('gnocchi-metricd','audit-disabled','lsb-script','','gnocchi-metricd','status','',0,0,0,30,30);
1003 1004
 COMMIT;

Loading…
Cancel
Save