starlingx/integ
Code Issues Proposed changes

Remove meta_remove_bad_logrotate.patch

Browse Source 
We can do the similar change like we did in
https://review.openstack.org/#/c/620466/
Since we have duplicated log configuration,we can erase
logrotate.d/dhcp instead of remove the file with the patch.

Deployment test pass and logrotate.d/dhcp file check pass.

Story: 2004452
Task: 28131

Change-Id: Ib22fa073ca4e09af1b25854f0f1c8574f9337f3c
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl 2018-12-11 01:44:20 +08:00
parent 4f3e626029
commit 7754d7e95c
3 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base/haproxy-config/centos/haproxy-config.spec
View File

@ -32,6 +32,9 @@ mkdir -p %{_sysconfdir}/init.d
%post
/bin/systemctl disable haproxy.service
if test -s %{_sysconfdir}/logrotate.d/haproxy ; then
echo '#See /etc/logrotate.d/syslog for haproxy rules' > %{_sysconfdir}/logrotate.d/haproxy
fi
%files
%defattr(-,root,root,-)

1
base/haproxy/centos/meta_patches/PATCH_ORDER
View File

@ -1,3 +1,2 @@
spec-include-TiS-changes.patch
meta_remove_bad_logrotate.patch
0001-Update-package-versioning-for-TIS-format.patch

41
base/haproxy/centos/meta_patches/meta_remove_bad_logrotate.patch
View File

@ -1,41 +0,0 @@
From 3eac39ba534b92dbcb3a898442b09be7acc389bb Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:12:36 -0400
Subject: [PATCH] WRS: meta_remove_bad_logrotate.patch
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
---
SPECS/haproxy.spec | 3 ---
1 file changed, 3 deletions(-)
diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec
index 53def97..39c0c86 100644
--- a/SPECS/haproxy.spec
+++ b/SPECS/haproxy.spec
@@ -18,7 +18,6 @@ URL: http://www.haproxy.org/
Source0: http://www.haproxy.org/download/1.5/src/haproxy-%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.cfg
-Source3: %{name}.logrotate
Source4: %{name}.sysconfig
Source5: halog.1
@@ -86,7 +85,6 @@ popd
%{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
%{__install} -p -D -m 0640 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
-%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__install} -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/halog.1
%{__install} -d -m 0755 %{buildroot}%{haproxy_home}
@@ -139,7 +137,6 @@ fi
%dir %{haproxy_datadir}
%{haproxy_datadir}/*
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_unitdir}/%{name}.service
%{_sbindir}/%{name}
--
1.8.3.1