From b5ef59fc8ed4148e4458de97b7a6108297fc567f Mon Sep 17 00:00:00 2001 From: Eric MacDonald Date: Wed, 31 Jan 2024 19:19:05 +0000 Subject: [PATCH] Remove guestServer and guestAgent from systemd-presets The stx/nfv/mtce-guest service has been deprecated and is no longer built as part of the nfv git. https://opendev.org/starlingx/nfv/commit/ bfded2ded62263695ec37fb6214eda7b191c1cbc However, removing the guestServer and guestAgent systemd presets were missed. Therefore, as a final cleanup effort for these deprecated services, this update removes all references to both the guestAgent and guestServer from starlingX systemd-presets. Test Plan: PASS: Full clean Debian build PASS: Debian ISO install Standard system with worker and storage PASS: Verify guestServer and guestAgent service files are not packaged. Related-Bug: 2051389 Change-Id: I4b0dfa1739f35b0ceab3b6b98a9b24eb53caa1a9 Signed-off-by: Eric MacDonald --- base/systemd-presets/source/stx/systemd/traits/aio.preset | 3 --- .../source/stx/systemd/traits/controller.preset | 4 ---- .../source/stx/systemd/traits/lowlatency.preset | 3 --- base/systemd-presets/source/stx/systemd/traits/storage.preset | 4 ---- .../source/stx/systemd/traits/worker-lowlatency.preset | 4 ---- base/systemd-presets/source/stx/systemd/traits/worker.preset | 4 ---- 6 files changed, 22 deletions(-) diff --git a/base/systemd-presets/source/stx/systemd/traits/aio.preset b/base/systemd-presets/source/stx/systemd/traits/aio.preset index e555d1cdb..a7bcf4170 100644 --- a/base/systemd-presets/source/stx/systemd/traits/aio.preset +++ b/base/systemd-presets/source/stx/systemd/traits/aio.preset @@ -116,9 +116,6 @@ enable hostw.service enable pmon.service enable lmon.service -# mtce-guest.spec -enable guestServer.service - # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO) #enable collect-engtools.service diff --git a/base/systemd-presets/source/stx/systemd/traits/controller.preset b/base/systemd-presets/source/stx/systemd/traits/controller.preset index 34bbfb8a7..d38eae044 100644 --- a/base/systemd-presets/source/stx/systemd/traits/controller.preset +++ b/base/systemd-presets/source/stx/systemd/traits/controller.preset @@ -119,10 +119,6 @@ enable hostw.service enable pmon.service enable lmon.service -# mtce-guest.spec -disable guestServer.service - - # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO) #enable collect-engtools.service diff --git a/base/systemd-presets/source/stx/systemd/traits/lowlatency.preset b/base/systemd-presets/source/stx/systemd/traits/lowlatency.preset index e555d1cdb..a7bcf4170 100644 --- a/base/systemd-presets/source/stx/systemd/traits/lowlatency.preset +++ b/base/systemd-presets/source/stx/systemd/traits/lowlatency.preset @@ -116,9 +116,6 @@ enable hostw.service enable pmon.service enable lmon.service -# mtce-guest.spec -enable guestServer.service - # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO) #enable collect-engtools.service diff --git a/base/systemd-presets/source/stx/systemd/traits/storage.preset b/base/systemd-presets/source/stx/systemd/traits/storage.preset index d9e31da64..e54450e5e 100644 --- a/base/systemd-presets/source/stx/systemd/traits/storage.preset +++ b/base/systemd-presets/source/stx/systemd/traits/storage.preset @@ -108,9 +108,6 @@ enable hostw.service enable pmon.service enable lmon.service -# mtce-guest.spec -disable guestServer.service - # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO) #enable collect-engtools.service @@ -150,7 +147,6 @@ disable drbd.service disable fminit.service disable lighttpd.service disable memcached.service -disable guestAgent.service disable slapd.service disable barbican-api.service disable barbican-keystone-listener.service diff --git a/base/systemd-presets/source/stx/systemd/traits/worker-lowlatency.preset b/base/systemd-presets/source/stx/systemd/traits/worker-lowlatency.preset index f82e2b20a..8fe5ee542 100644 --- a/base/systemd-presets/source/stx/systemd/traits/worker-lowlatency.preset +++ b/base/systemd-presets/source/stx/systemd/traits/worker-lowlatency.preset @@ -111,9 +111,6 @@ enable hostw.service enable pmon.service enable lmon.service -# mtce-guest.spec -enable guestServer.service - # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO) #enable collect-engtools.service @@ -149,7 +146,6 @@ disable drbd.service disable fminit.service disable lighttpd.service disable memcached.service -disable guestAgent.service disable slapd.service disable barbican-api.service disable barbican-keystone-listener.service diff --git a/base/systemd-presets/source/stx/systemd/traits/worker.preset b/base/systemd-presets/source/stx/systemd/traits/worker.preset index f82e2b20a..8fe5ee542 100644 --- a/base/systemd-presets/source/stx/systemd/traits/worker.preset +++ b/base/systemd-presets/source/stx/systemd/traits/worker.preset @@ -111,9 +111,6 @@ enable hostw.service enable pmon.service enable lmon.service -# mtce-guest.spec -enable guestServer.service - # collect-engtools.spec (Move to rutime enablement. Typically not installed. Disable, not needed for AIO) #enable collect-engtools.service @@ -149,7 +146,6 @@ disable drbd.service disable fminit.service disable lighttpd.service disable memcached.service -disable guestAgent.service disable slapd.service disable barbican-api.service disable barbican-keystone-listener.service