Merge "Fix Logrotate rules for VIM"

This commit is contained in:
Zuul 2018-06-19 16:24:39 +00:00 committed by Gerrit Code Review
commit 0204c3b636
2 changed files with 6 additions and 6 deletions

View File

@ -102,7 +102,7 @@ install -p -D -m 600 nfv-plugins/nfv_plugins/event_log_handlers/config.ini %{bui
install -d -m 755 %{buildroot}/etc/nfv/nfv_plugins/nfvi_plugins/
install -p -D -m 600 nfv-plugins/nfv_plugins/nfvi_plugins/config.ini %{buildroot}/etc/nfv/nfv_plugins/nfvi_plugins/config.ini
install -d -m 755 %{buildroot}/
install -p -D -m 755 nfv-plugins/scripts/nfvi_plugins.logrotate %{buildroot}/etc/logrotate.d/nfvi_plugins.logrotate
install -p -D -m 644 nfv-plugins/scripts/nfvi-plugins.logrotate %{buildroot}/etc/logrotate.d/nfvi-plugins.logrotate
# nfv-vim
install -d -m 755 %{buildroot}/usr/lib/ocf/resource.d/nfv
@ -136,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc nfv-plugins/LICENSE
%dir /etc/logrotate.d/
/etc/logrotate.d/nfvi_plugins.logrotate
/etc/logrotate.d/nfvi-plugins.logrotate
%dir /etc/nfv/nfv_plugins/
%config(noreplace)/etc/nfv/nfv_plugins/alarm_handlers/config.ini
%config(noreplace)/etc/nfv/nfv_plugins/event_log_handlers/config.ini

View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2015-2016 Wind River Systems, Inc.
# Copyright (c) 2015-2018 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -8,7 +8,7 @@ nodateext
/var/log/nfv-vim-alarms.log
{
nodateext
size 100M
size 10M
start 1
missingok
rotate 20
@ -19,7 +19,7 @@ nodateext
/var/log/nfv-vim-events.log
{
nodateext
size 100M
size 10M
start 1
missingok
rotate 20
@ -30,7 +30,7 @@ nodateext
/var/log/nfvi-openstack.log
{
nodateext
size 100M
size 10M
start 1
missingok
rotate 20