From ab42e2610a31450d1c08e36a622ba49bf37f4384 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 30 Oct 2023 20:22:25 +0100 Subject: [PATCH] MT#57982 Switch fully to keydb We only support keydb now, and the config knob and migration script have been removed. Hardcode keydb for the redis flavor we intend to use, and add checks to make sure the redis service is not running nor enabled anymore Change-Id: I1a9ecb7e26346cd23618b464a7f5f420d5ab7263 (cherry picked from commit 716ea65865df5641c9191ba8f1df5c836e6b5401) --- templates/400_process-debian.yaml.tt2 | 5 ++++- templates/510_init-daemons-ngcp.yaml.tt2 | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/templates/400_process-debian.yaml.tt2 b/templates/400_process-debian.yaml.tt2 index 3c62ab1..7658d3f 100644 --- a/templates/400_process-debian.yaml.tt2 +++ b/templates/400_process-debian.yaml.tt2 @@ -17,9 +17,12 @@ process: ntpd: running: [% ntp.backend == 'ntpd' ? 'true' : 'false ' %] - [% database.key_value.flavor %]-server: + keydb-server: running: true + redis-server: + running: false + rsyslogd: running: true diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2 index e8ba322..73b9109 100644 --- a/templates/510_init-daemons-ngcp.yaml.tt2 +++ b/templates/510_init-daemons-ngcp.yaml.tt2 @@ -96,10 +96,14 @@ service: enabled: [% general.process_handler == 'none' && is_lb && pushd.enable == "yes" ? 'true' : 'false' %] running: [% is_lb && pushd.enable == "yes" ? 'true' : 'false' %] - [% database.key_value.flavor %]-server.service: + keydb-server.service: enabled: [% redis.enable == "yes" ? 'true' : 'false' %] running: [% redis.enable == "yes" ? 'true' : 'false' %] + redis-server.service: + enabled: false + running: false + slapd.service: enabled: [% is_mgmt && ldap.enable == "yes" ? 'true' : 'false' %] running: [% is_mgmt && ldap.enable == "yes" ? 'true' : 'false' %]