summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-25 15:28:06 -0400
committerGitHub <noreply@github.com>2017-07-25 15:28:06 -0400
commitd1ee0ee182ede00cd2e333328c7d4fabdeb4c759 (patch)
tree8c655ca4301587989cf69aa5fd5055a42e7808c4
parent14fbd4a6b883a1080f7b57d1acd3a5240a92f39a (diff)
parent46d9ba942e49e4b6953dc8fa47e38d6ea98ec122 (diff)
downloadopenshift-d1ee0ee182ede00cd2e333328c7d4fabdeb4c759.tar.gz
openshift-d1ee0ee182ede00cd2e333328c7d4fabdeb4c759.tar.bz2
openshift-d1ee0ee182ede00cd2e333328c7d4fabdeb4c759.tar.xz
openshift-d1ee0ee182ede00cd2e333328c7d4fabdeb4c759.zip
Merge pull request #4866 from sdodson/timeoutstartsec-node
Set TimeoutStartSec=300
-rw-r--r--roles/openshift_node/templates/node.service.j21
-rw-r--r--roles/openshift_node_upgrade/templates/node.service.j21
2 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/node.service.j2 b/roles/openshift_node/templates/node.service.j2
index d4f0b7762..e12a52c15 100644
--- a/roles/openshift_node/templates/node.service.j2
+++ b/roles/openshift_node/templates/node.service.j2
@@ -24,6 +24,7 @@ WorkingDirectory=/var/lib/origin/
SyslogIdentifier={{ openshift.common.service_type }}-node
Restart=always
RestartSec=5s
+TimeoutStartSec=300
OOMScoreAdjust=-999
[Install]
diff --git a/roles/openshift_node_upgrade/templates/node.service.j2 b/roles/openshift_node_upgrade/templates/node.service.j2
index d4f0b7762..e12a52c15 100644
--- a/roles/openshift_node_upgrade/templates/node.service.j2
+++ b/roles/openshift_node_upgrade/templates/node.service.j2
@@ -24,6 +24,7 @@ WorkingDirectory=/var/lib/origin/
SyslogIdentifier={{ openshift.common.service_type }}-node
Restart=always
RestartSec=5s
+TimeoutStartSec=300
OOMScoreAdjust=-999
[Install]