From f4ea5ebee65a66ac65954ace41906e0fff8ac4bc Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Wed, 22 Aug 2018 10:43:31 -0400 Subject: [PATCH] RPMS - Add stub /etc/sysconfig/origin-node Previously we'd removed this file from the RPM, however that resulted in the file being removed during upgrades which altered configuration on running systems --- contrib/systemd/origin-node.sysconfig | 1 + origin.spec | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 contrib/systemd/origin-node.sysconfig diff --git a/contrib/systemd/origin-node.sysconfig b/contrib/systemd/origin-node.sysconfig new file mode 100644 index 000000000000..036d17bc7669 --- /dev/null +++ b/contrib/systemd/origin-node.sysconfig @@ -0,0 +1 @@ +# populated by openshift-ansible diff --git a/origin.spec b/origin.spec index 09916b1a8722..596fb2dfb5f0 100644 --- a/origin.spec +++ b/origin.spec @@ -304,6 +304,9 @@ done install -d -m 0755 %{buildroot}%{_sysconfdir}/origin/{master,node} +# stub filed required to ensure config is not reverted during upgrades +install -m 0644 contrib/systemd/origin-node.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-node + # Install man1 man pages install -d -m 0755 %{buildroot}%{_mandir}/man1 install -m 0644 docs/man/man1/* %{buildroot}%{_mandir}/man1/ @@ -385,6 +388,7 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder %files node %{_bindir}/openshift-node-config %{_sysconfdir}/systemd/system.conf.d/origin-accounting.conf +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-node %defattr(-,root,root,0700) %config(noreplace) %{_sysconfdir}/origin/node