summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-25 14:33:17 -0400
committerGitHub <noreply@github.com>2017-07-25 14:33:17 -0400
commit14fbd4a6b883a1080f7b57d1acd3a5240a92f39a (patch)
tree43609682fd17a32ea9a234cc08a5af2196f445f9
parent5b0525f509906a43071f824b02ceb8d170c300ed (diff)
parent9d7afaacc0c053f04a596753e28d7382ec0b629d (diff)
downloadopenshift-14fbd4a6b883a1080f7b57d1acd3a5240a92f39a.tar.gz
openshift-14fbd4a6b883a1080f7b57d1acd3a5240a92f39a.tar.bz2
openshift-14fbd4a6b883a1080f7b57d1acd3a5240a92f39a.tar.xz
openshift-14fbd4a6b883a1080f7b57d1acd3a5240a92f39a.zip
Merge pull request #4863 from openshift/revert-4755-set-killmode-to-process-in-node-service-file
Revert "set KillMode to process in node service file"
-rw-r--r--roles/openshift_node/templates/node.service.j21
-rw-r--r--roles/openshift_node_upgrade/templates/node.service.j21
2 files changed, 0 insertions, 2 deletions
diff --git a/roles/openshift_node/templates/node.service.j2 b/roles/openshift_node/templates/node.service.j2
index 1dbe58439..d4f0b7762 100644
--- a/roles/openshift_node/templates/node.service.j2
+++ b/roles/openshift_node/templates/node.service.j2
@@ -25,7 +25,6 @@ SyslogIdentifier={{ openshift.common.service_type }}-node
Restart=always
RestartSec=5s
OOMScoreAdjust=-999
-KillMode=process
[Install]
WantedBy=multi-user.target
diff --git a/roles/openshift_node_upgrade/templates/node.service.j2 b/roles/openshift_node_upgrade/templates/node.service.j2
index 1dbe58439..d4f0b7762 100644
--- a/roles/openshift_node_upgrade/templates/node.service.j2
+++ b/roles/openshift_node_upgrade/templates/node.service.j2
@@ -25,7 +25,6 @@ SyslogIdentifier={{ openshift.common.service_type }}-node
Restart=always
RestartSec=5s
OOMScoreAdjust=-999
-KillMode=process
[Install]
WantedBy=multi-user.target