Skip to content

Commit

Permalink
RPMS - Add stub /etc/sysconfig/origin-node
Browse files Browse the repository at this point in the history
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
  • Loading branch information
sdodson committed Aug 22, 2018
1 parent 64882c0 commit f1fe533
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions contrib/systemd/origin-node.sysconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# populated by openshift-ansible
4 changes: 4 additions & 0 deletions origin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit f1fe533

Please sign in to comment.