Skip to content

Commit f1fe533

Browse files
committed
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
1 parent 64882c0 commit f1fe533

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

contrib/systemd/origin-node.sysconfig

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# populated by openshift-ansible

origin.spec

+4
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,9 @@ done
304304

305305
install -d -m 0755 %{buildroot}%{_sysconfdir}/origin/{master,node}
306306

307+
# stub filed required to ensure config is not reverted during upgrades
308+
install -m 0644 contrib/systemd/origin-node.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-node
309+
307310
# Install man1 man pages
308311
install -d -m 0755 %{buildroot}%{_mandir}/man1
309312
install -m 0644 docs/man/man1/* %{buildroot}%{_mandir}/man1/
@@ -385,6 +388,7 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
385388
%files node
386389
%{_bindir}/openshift-node-config
387390
%{_sysconfdir}/systemd/system.conf.d/origin-accounting.conf
391+
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-node
388392
%defattr(-,root,root,0700)
389393
%config(noreplace) %{_sysconfdir}/origin/node
390394

0 commit comments

Comments
 (0)