starlingx
/
config-files
Code Issues Proposed changes

Add automatic cleanup for puppet reports files 

The systemd-tmpfiles-clean.service is responsible for automatic
cleanup of old files, however, this service was failed upon
installation and configuration of the platform.
The error was related to the kubernetes.conf file to have
a reference to kube user, an override conf was added to
systemd config files to reference root user.
Also, the location /var/lib/puppet/reports was added to the
systemd conf file.

Closes-Bug: 1958269

Test Plan:

PASS: Verify systemd-tmpfiles-clean.service is active/loaded
PASS: Verify /var/lib/puppet/reports is being cleaned automatically
PASS: Verify cleanup on both AIO and Standard configurations
Signed-off-by: Adriano Oliveira <adriano.oliveira@windriver.com>
Change-Id: I0d31b778c4c626a6aaf13dd3814607be38ad21ee
This commit is contained in:
Adriano Oliveira 2022-01-18 11:37:01 -05:00
parent 8c4cf09858
commit 10957a714d
6 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
systemd-config/centos/systemd-config.spec
View File

@ -39,6 +39,7 @@ install -d %{buildroot}%{local_systemd_system}
install -m644 60-persistent-storage.rules %{buildroot}%{local_udev_rules_d}/60-persistent-storage.rules install -m644 60-persistent-storage.rules %{buildroot}%{local_udev_rules_d}/60-persistent-storage.rules
install -m644 journald.conf %{buildroot}%{_datadir}/starlingx/journald.conf install -m644 journald.conf %{buildroot}%{_datadir}/starlingx/journald.conf
install -m644 kubernetes.conf.tmpfiles.d %{buildroot}%{local_tmpfiles_d}/kubernetes.conf
install -m644 systemd.conf.tmpfiles.d %{buildroot}%{local_tmpfiles_d}/systemd.conf install -m644 systemd.conf.tmpfiles.d %{buildroot}%{local_tmpfiles_d}/systemd.conf
install -m644 tmp.conf.tmpfiles.d %{buildroot}%{local_tmpfiles_d}/tmp.conf install -m644 tmp.conf.tmpfiles.d %{buildroot}%{local_tmpfiles_d}/tmp.conf
install -m644 tmp.mount %{buildroot}%{local_systemd_system}/tmp.mount install -m644 tmp.mount %{buildroot}%{local_systemd_system}/tmp.mount
@ -54,6 +55,7 @@ fi
%license LICENSE %license LICENSE
%{local_udev_rules_d}/60-persistent-storage.rules %{local_udev_rules_d}/60-persistent-storage.rules
%{_datadir}/starlingx/journald.conf %{_datadir}/starlingx/journald.conf
%{local_tmpfiles_d}/kubernetes.conf
%{local_tmpfiles_d}/systemd.conf %{local_tmpfiles_d}/systemd.conf
%{local_tmpfiles_d}/tmp.conf %{local_tmpfiles_d}/tmp.conf
%{local_systemd_system}/tmp.mount %{local_systemd_system}/tmp.mount

1
systemd-config/debian/deb_folder/systemd-config.install
View File

@ -1,5 +1,6 @@
60-persistent-storage.rules usr/lib/udev/rules.d 60-persistent-storage.rules usr/lib/udev/rules.d
journald.conf usr/share/starlingx journald.conf usr/share/starlingx
kubernetes.conf etc/tmpfiles.d
systemd.conf etc/tmpfiles.d systemd.conf etc/tmpfiles.d
tmp.conf etc/tmpfiles.d tmp.conf etc/tmpfiles.d
tmp.mount etc/systemd/system tmp.mount etc/systemd/system

1
systemd-config/files/kubernetes.conf.tmpfiles.d Normal file
View File

@ -0,0 +1 @@
d /var/run/kubernetes 0755 root root -

2
systemd-config/files/systemd.conf.tmpfiles.d
View File

@ -40,3 +40,5 @@ a+ /var/log/journal/%m/system.journal - - - - group:sys_protected:r--,group:whee
d /var/lib/systemd 0755 root root - d /var/lib/systemd 0755 root root -
d /var/lib/systemd/coredump 0755 root root 3d d /var/lib/systemd/coredump 0755 root root 3d
e /var/lib/puppet/reports/* 0755 root root 30d

1
systemd-config/source-debian/kubernetes.conf Normal file
View File

@ -0,0 +1 @@
d /var/run/kubernetes 0755 root root -

2
systemd-config/source-debian/systemd.conf
View File

@ -40,3 +40,5 @@ a+ /var/log/journal/%m/system.journal - - - - group:sys_protected:r--,group:whee
d /var/lib/systemd 0755 root root - d /var/lib/systemd 0755 root root -
d /var/lib/systemd/coredump 0755 root root 3d d /var/lib/systemd/coredump 0755 root root 3d
e /var/lib/puppet/reports/* 0755 root root 30d