From 0db57d60be9ba74866f22f9bebddf59a11a4897a Mon Sep 17 00:00:00 2001 From: "Kyale, Eliud" Date: Wed, 10 Jan 2024 14:43:13 -0500 Subject: [PATCH] Add service dependancy haproxy dnsmasq haproxy uses dns resolution add service dependency to sm database to ensure that dnsmasq service is started before haproxy and dnsmasq is disabled after haproxy is disabled Test plan: PASS - AIO-SX: iso install PASS - AIO-SX: reboot test PASS - AIO-DX: iso install PASS - AIO-DX: swact test Closes-Bug: #2043506 Change-Id: I494faebfe67843d34819f66a0a2fbd977657bb6b Signed-off-by: Kyale, Eliud --- service-mgmt/sm-db/database/create_sm_db.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service-mgmt/sm-db/database/create_sm_db.sql b/service-mgmt/sm-db/database/create_sm_db.sql index 76b1cd00..c7f7abd1 100644 --- a/service-mgmt/sm-db/database/create_sm_db.sql +++ b/service-mgmt/sm-db/database/create_sm_db.sql @@ -168,6 +168,7 @@ CREATE TABLE SERVICE_HEARTBEAT ( ID INTEGER PRIMARY KEY AUTOINCREMENT, PROVISION 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'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','haproxy','not-applicable','enable','oam-ip','enabled-active'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','haproxy','not-applicable','enable','dnsmasq','enabled-active'); 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'); @@ -194,6 +195,7 @@ INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dnsmasq','not-applicable','ena INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dnsmasq','not-applicable','enable','platform-fs','enabled-active'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dnsmasq','not-applicable','disable','keystone','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dnsmasq','not-applicable','disable','barbican-api','disabled'); +INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','dnsmasq','not-applicable','disable','haproxy','disabled'); INSERT INTO "SERVICE_DEPENDENCY" VALUES('action','fm-mgr','not-applicable','enable','postgres','enabled-active'); 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');