From ecb42ddf7af7c902e9f130349a54ba2a73e351c3 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 21 Jul 2021 19:24:09 +0200 Subject: [PATCH] TT#129153 Remove handling for Debian releases older than bullseye This was support to handle the transition period where we were supporting both buster and bullseye. Which is no longer necessary starting with mr9.5. Change-Id: I125f03b5baea172065e1e947f66619cee7eeabe6 --- templates/400_process-debian.yaml.tt2 | 8 -------- templates/500_init-daemons-dabian.yaml.tt2 | 6 ------ templates/610_kernel-sysctl-params.yaml.tt2 | 4 ---- 3 files changed, 18 deletions(-) diff --git a/templates/400_process-debian.yaml.tt2 b/templates/400_process-debian.yaml.tt2 index 156d61b..c578111 100644 --- a/templates/400_process-debian.yaml.tt2 +++ b/templates/400_process-debian.yaml.tt2 @@ -11,16 +11,8 @@ process: getty: running: [% general.init_system == 'systemd' ? 'false' : 'true' %] -{{if eq .Env.DEBIAN_RELEASE "11"}} mariadbd: running: true -{{else}} - mysqld: - running: true - - mysqld_safe: - running: [% general.init_system == 'systemd' ? 'false' : 'true' %] -{{end}} redis-server: running: true diff --git a/templates/500_init-daemons-dabian.yaml.tt2 b/templates/500_init-daemons-dabian.yaml.tt2 index f02ce41..8d0bc67 100644 --- a/templates/500_init-daemons-dabian.yaml.tt2 +++ b/templates/500_init-daemons-dabian.yaml.tt2 @@ -51,12 +51,6 @@ service: enabled: [% general.ngcp_type == 'carrier' && (is_proxy || is_li_dist) ? 'true' : 'false' %] running: [% general.ngcp_type == 'carrier' && (is_proxy || is_li_dist) ? 'true' : 'false' %] -{{if lt .Env.DEBIAN_RELEASE "11"}} - mysql.service: - enabled: true - running: true -{{end}} - ngcp-io-scheduler.service: enabled: true running: true diff --git a/templates/610_kernel-sysctl-params.yaml.tt2 b/templates/610_kernel-sysctl-params.yaml.tt2 index 7f899c0..4bc1d7d 100644 --- a/templates/610_kernel-sysctl-params.yaml.tt2 +++ b/templates/610_kernel-sysctl-params.yaml.tt2 @@ -4,11 +4,7 @@ kernel-param: value: "1" kernel.core_pattern: -{{if eq .Env.DEBIAN_RELEASE "11"}} value: "|/lib/systemd/systemd-coredump %P %u %g %s %t 9223372036854775808 %h" -{{else}} - value: "|/lib/systemd/systemd-coredump %P %u %g %s %t 9223372036854775808 %h %e" -{{end}} fs.suid_dumpable: value: "2"