Merge pull request #20717 from sdodson/restore-sysconfig-file

RPMS - Add stub /etc/sysconfig/origin-node
openshift · Aug 22, 2018 · c8f4a14 · c8f4a14
2 parents 75c9679 + f4ea5eb
commit c8f4a14
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/contrib/systemd/origin-node.sysconfig b/contrib/systemd/origin-node.sysconfig
@@ -0,0 +1 @@
+# populated by openshift-ansible
diff --git 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