Debian: Reorganize storage config package
This work: - is part of Debian integration effort. - affect Debian only - will allow puppet manifests to be applied on storage node at unlock/reboot time. This specific commit: - allows controllerconfig, workerconfig-standalone and storageconfig packages to coexist on the same iso by letting files be selected at runtime - lets storageconfig service be installed by systemd Test Plan on Debian: PASS: controllers unlocked on AIO-SX, AIO-DX, Standard & Storage PASS: workers unlocked on Standard & Storage PASS: storages unlocked on Storage PASS: storageconfig started puppet manifest apply on storage nodes PASS: controllerconfig is running on controller node on AIO-SX, AIO-DX, Standard & Storage PASS: workerconfig is not running on controller and storage nodes on AIO-SX, AIO-DX, Standard & Storage PASS: storageconfig is not running on controller and worker nodes on AIO-SX, AIO-DX, Standard & Storage PASS: workerconfig is running on worker node Standard & Storage Depends-On: https://review.opendev.org/c/starlingx/metal/+/860495 Story: 2010211 Task: 46506 Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com> Change-Id: I83dde1cf406217e483f05f5504659930612edf70
This commit is contained in:
parent
eb3b253ee5
commit
feb258db57
@ -5,7 +5,7 @@ cert-mon
|
|||||||
cgts-client
|
cgts-client
|
||||||
config-gate
|
config-gate
|
||||||
controllerconfig
|
controllerconfig
|
||||||
#storageconfig
|
storageconfig
|
||||||
sysinv
|
sysinv
|
||||||
sysinv-agent
|
sysinv-agent
|
||||||
workerconfig-standalone
|
workerconfig-standalone
|
||||||
|
@ -1,20 +1,23 @@
|
|||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
#export DH_VERBOSE=1
|
#export DH_VERBOSE=1
|
||||||
|
|
||||||
PKGDIR=$(CURDIR)/debian/tmp
|
PKGDIR := $(CURDIR)/debian/tmp
|
||||||
|
|
||||||
export INITDDIR=$(PKGDIR)/etc/init.d
|
export INITDDIR=$(PKGDIR)/etc/init.d
|
||||||
export GOENABLEDDIR=$(PKGDIR)/etc/goenabled.d
|
export GOENABLEDDIR=$(PKGDIR)/etc/goenabled.d
|
||||||
export SYSTEMDDIR=$(PKGDIR)/lib/systemd/system
|
|
||||||
|
|
||||||
%:
|
%:
|
||||||
dh $@
|
dh $@
|
||||||
|
|
||||||
override_dh_auto_build:
|
override_dh_auto_build:
|
||||||
: # nothing to be built, just skip
|
: # No build required
|
||||||
|
|
||||||
override_dh_fixperms:
|
override_dh_auto_install:
|
||||||
dh_fixperms -Xstorage_config
|
install -d -m 755 ${INITDDIR}
|
||||||
|
install -p -D -m 700 storage_config ${INITDDIR}/storage_config
|
||||||
|
install -d -m 755 ${GOENABLEDDIR}
|
||||||
|
install -p -D -m 700 config_goenabled_check.sh ${GOENABLEDDIR}/config_goenabled_check.sh.storage
|
||||||
|
|
||||||
override_dh_installsystemd:
|
override_dh_installsystemd:
|
||||||
dh_installsystemd --name storageconfig
|
dh_installsystemd -pstorageconfig --name=storageconfig --no-start storageconfig.service
|
||||||
|
|
||||||
|
@ -1,3 +1,2 @@
|
|||||||
etc/init.d
|
etc/init.d
|
||||||
etc/goenabled.d
|
etc/goenabled.d
|
||||||
lib/systemd/system/config
|
|
||||||
|
@ -1,3 +1,2 @@
|
|||||||
etc/init.d/storage_config
|
etc/init.d/storage_config
|
||||||
etc/goenabled.d/config_goenabled_check.sh
|
etc/goenabled.d/*
|
||||||
lib/systemd/system/storageconfig.service
|
|
||||||
|
@ -10,8 +10,8 @@ Type=simple
|
|||||||
ExecStart=/etc/init.d/storage_config start
|
ExecStart=/etc/init.d/storage_config start
|
||||||
ExecStop=
|
ExecStop=
|
||||||
ExecReload=
|
ExecReload=
|
||||||
StandardOutput=syslog+console
|
StandardOutput=journal+console
|
||||||
StandardError=syslog+console
|
StandardError=journal+console
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
|
|
||||||
[Install]
|
[Install]
|
Loading…
Reference in New Issue
Block a user