From ddf7f070dc27c889881fdccf6140cc64a806a985 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Thu, 25 Aug 2022 10:23:09 -0400 Subject: [PATCH] debian: Remove package preset install for config Remove the installation of per-package preset installs since they are centrally managed now by the ISO install for the following packages: - config-gate-worker - config-gate - controllerconfig - sysinv-agent - sysinv-fpga-agent Story: 2009968 Task: 46406 Test Plan PASS Build package PASS Build ISO PASS Check for non-existant preset file in /etc/systemd/system-preset Depends-On: https://review.opendev.org/c/starlingx/integ/+/853653 Signed-off-by: Charles Short Change-Id: I4204f75d3a7cfc25ab8b5f303d12023eafc212f0 --- config-gate/debian/deb_folder/config-gate-worker.install | 1 - config-gate/debian/deb_folder/config-gate.install | 1 - .../debian/deb_folder/systemd/00-config-gate-worker.preset | 1 - config-gate/debian/deb_folder/systemd/00-config-gate.preset | 1 - controllerconfig/debian/deb_folder/controllerconfig.install | 1 - .../debian/deb_folder/systemd/00-controllerconfig.preset | 1 - sysinv/sysinv-agent/debian/deb_folder/sysinv-agent.install | 1 - .../debian/deb_folder/systemd/00-sysinv-agent.preset | 1 - .../debian/deb_folder/sysinv-fpga-agent.install | 3 +-- .../debian/deb_folder/systemd/00-sysinv-fpga-agent.preset | 3 --- 10 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 config-gate/debian/deb_folder/systemd/00-config-gate-worker.preset delete mode 100644 config-gate/debian/deb_folder/systemd/00-config-gate.preset delete mode 100644 controllerconfig/debian/deb_folder/systemd/00-controllerconfig.preset delete mode 100644 sysinv/sysinv-agent/debian/deb_folder/systemd/00-sysinv-agent.preset delete mode 100644 sysinv/sysinv-fpga-agent/debian/deb_folder/systemd/00-sysinv-fpga-agent.preset diff --git a/config-gate/debian/deb_folder/config-gate-worker.install b/config-gate/debian/deb_folder/config-gate-worker.install index 4f1b860a0b..1dcdc9871f 100644 --- a/config-gate/debian/deb_folder/config-gate-worker.install +++ b/config-gate/debian/deb_folder/config-gate-worker.install @@ -1,3 +1,2 @@ lib/systemd/system/worker-config-gate.service usr/sbin/wait_for_worker_config_init.sh -debian/systemd/00-config-gate-worker.preset etc/systemd/system-preset diff --git a/config-gate/debian/deb_folder/config-gate.install b/config-gate/debian/deb_folder/config-gate.install index 12d38a53a2..b5285101d4 100644 --- a/config-gate/debian/deb_folder/config-gate.install +++ b/config-gate/debian/deb_folder/config-gate.install @@ -1,3 +1,2 @@ usr/sbin/wait_for_config_init.sh lib/systemd/system/config.service -debian/systemd/00-config-gate.preset /etc/systemd/system-preset diff --git a/config-gate/debian/deb_folder/systemd/00-config-gate-worker.preset b/config-gate/debian/deb_folder/systemd/00-config-gate-worker.preset deleted file mode 100644 index cebd9b1158..0000000000 --- a/config-gate/debian/deb_folder/systemd/00-config-gate-worker.preset +++ /dev/null @@ -1 +0,0 @@ -enable config.service diff --git a/config-gate/debian/deb_folder/systemd/00-config-gate.preset b/config-gate/debian/deb_folder/systemd/00-config-gate.preset deleted file mode 100644 index f31c5b17b0..0000000000 --- a/config-gate/debian/deb_folder/systemd/00-config-gate.preset +++ /dev/null @@ -1 +0,0 @@ -disable worker-config-gate.service diff --git a/controllerconfig/debian/deb_folder/controllerconfig.install b/controllerconfig/debian/deb_folder/controllerconfig.install index 3c1d3f39dc..e042dffb09 100644 --- a/controllerconfig/debian/deb_folder/controllerconfig.install +++ b/controllerconfig/debian/deb_folder/controllerconfig.install @@ -3,4 +3,3 @@ etc/goenabled.d/* usr/lib/python*/dist-packages/* etc/init.d/* etc/upgrade.d/* -debian/systemd/00-controllerconfig.preset etc/systemd/system-preset diff --git a/controllerconfig/debian/deb_folder/systemd/00-controllerconfig.preset b/controllerconfig/debian/deb_folder/systemd/00-controllerconfig.preset deleted file mode 100644 index 7f488d678a..0000000000 --- a/controllerconfig/debian/deb_folder/systemd/00-controllerconfig.preset +++ /dev/null @@ -1 +0,0 @@ -enable controllerconfig.service diff --git a/sysinv/sysinv-agent/debian/deb_folder/sysinv-agent.install b/sysinv/sysinv-agent/debian/deb_folder/sysinv-agent.install index ee690b44df..087a0cea50 100644 --- a/sysinv/sysinv-agent/debian/deb_folder/sysinv-agent.install +++ b/sysinv/sysinv-agent/debian/deb_folder/sysinv-agent.install @@ -1,4 +1,3 @@ -debian/systemd/00-sysinv-agent.preset etc/systemd/system-preset etc/init.d/sysinv-agent etc/pmon.d/sysinv-agent.conf usr/share/starlingx/pmon.d/sysinv-agent.conf diff --git a/sysinv/sysinv-agent/debian/deb_folder/systemd/00-sysinv-agent.preset b/sysinv/sysinv-agent/debian/deb_folder/systemd/00-sysinv-agent.preset deleted file mode 100644 index eac84c1540..0000000000 --- a/sysinv/sysinv-agent/debian/deb_folder/systemd/00-sysinv-agent.preset +++ /dev/null @@ -1 +0,0 @@ -enable sysinv-agent.service diff --git a/sysinv/sysinv-fpga-agent/debian/deb_folder/sysinv-fpga-agent.install b/sysinv/sysinv-fpga-agent/debian/deb_folder/sysinv-fpga-agent.install index 04db954359..b98a03477c 100644 --- a/sysinv/sysinv-fpga-agent/debian/deb_folder/sysinv-fpga-agent.install +++ b/sysinv/sysinv-fpga-agent/debian/deb_folder/sysinv-fpga-agent.install @@ -1,4 +1,3 @@ -debian/systemd/00-sysinv-fpga-agent.preset etc/systemd/system-preset etc/init.d/sysinv-fpga-agent etc/pmon.d/sysinv-fpga-agent.conf -usr/share/starlingx/pmon.d/sysinv-fpga-agent.conf \ No newline at end of file +usr/share/starlingx/pmon.d/sysinv-fpga-agent.conf diff --git a/sysinv/sysinv-fpga-agent/debian/deb_folder/systemd/00-sysinv-fpga-agent.preset b/sysinv/sysinv-fpga-agent/debian/deb_folder/systemd/00-sysinv-fpga-agent.preset deleted file mode 100644 index 9fae438e65..0000000000 --- a/sysinv/sysinv-fpga-agent/debian/deb_folder/systemd/00-sysinv-fpga-agent.preset +++ /dev/null @@ -1,3 +0,0 @@ -enable sysinv-fpga-agent.service -enable sysinv-conf-watcher.service -enable sysinv-conf-watcher.path