From f5c0d601702059d26908926aa306893ff1d7ef69 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Tue, 21 Aug 2018 13:10:45 -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/atomic-openshift-node.service | 22 +++++++++++++++++++
 contrib/systemd/origin-node.service           | 21 ++++++++++++++++++
 contrib/systemd/origin-node.sysconfig         |  1 +
 origin.spec                                   |  4 ++++
 4 files changed, 48 insertions(+)
 create mode 100644 contrib/systemd/atomic-openshift-node.service
 create mode 100644 contrib/systemd/origin-node.service
 create mode 100644 contrib/systemd/origin-node.sysconfig

diff --git a/contrib/systemd/atomic-openshift-node.service b/contrib/systemd/atomic-openshift-node.service
new file mode 100644
index 000000000000..987b76d463aa
--- /dev/null
+++ b/contrib/systemd/atomic-openshift-node.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Atomic OpenShift Node
+After=docker.service
+After=openvswitch.service
+Wants=docker.service
+Documentation=https://github.com/openshift/origin
+
+[Service]
+Type=notify
+EnvironmentFile=/etc/sysconfig/atomic-openshift-node
+Environment=GOTRACEBACK=crash
+ExecStart=/usr/bin/openshift start node --config=${CONFIG_FILE} $OPTIONS
+LimitNOFILE=65536
+LimitCORE=infinity
+WorkingDirectory=/var/lib/origin/
+SyslogIdentifier=atomic-openshift-node
+Restart=always
+RestartSec=5s
+OOMScoreAdjust=-999
+
+[Install]
+WantedBy=multi-user.target
diff --git a/contrib/systemd/origin-node.service b/contrib/systemd/origin-node.service
new file mode 100644
index 000000000000..793397a7d2d7
--- /dev/null
+++ b/contrib/systemd/origin-node.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Origin Node
+After=docker.service
+Wants=docker.service
+Documentation=https://github.com/openshift/origin
+
+[Service]
+Type=notify
+EnvironmentFile=/etc/sysconfig/origin-node
+Environment=GOTRACEBACK=crash
+ExecStart=/usr/bin/openshift start node --config=${CONFIG_FILE} $OPTIONS
+LimitNOFILE=65536
+LimitCORE=infinity
+WorkingDirectory=/var/lib/origin/
+SyslogIdentifier=origin-node
+Restart=always
+RestartSec=5s
+OOMScoreAdjust=-999
+
+[Install]
+WantedBy=multi-user.target
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..2e298ef2349b 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