diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-18 07:48:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 07:48:17 -0400 |
| commit | 63b77fbe00e4c724452a0256c6fdafc165755962 (patch) | |
| tree | 6b2b32616fe25f91d0658ea4ef73b79b1b3ab526 /roles/openshift_node/templates | |
| parent | 5ff1e1bec64ea99830003a7f7d44de0ac1e65a57 (diff) | |
| parent | 47d2e205fa6c76ec66cd22b9100b561cd71e6976 (diff) | |
| download | openshift-63b77fbe00e4c724452a0256c6fdafc165755962.tar.gz openshift-63b77fbe00e4c724452a0256c6fdafc165755962.tar.bz2 openshift-63b77fbe00e4c724452a0256c6fdafc165755962.tar.xz openshift-63b77fbe00e4c724452a0256c6fdafc165755962.zip | |
Merge pull request #5361 from kwoodson/fix_bootstrap_files
Provisioning updates.
Diffstat (limited to 'roles/openshift_node/templates')
| -rw-r--r-- | roles/openshift_node/templates/node.service.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/templates/node.service.j2 b/roles/openshift_node/templates/node.service.j2 index 0856737f6..7602d8ee6 100644 --- a/roles/openshift_node/templates/node.service.j2 +++ b/roles/openshift_node/templates/node.service.j2 @@ -12,17 +12,17 @@ After=dnsmasq.service [Service] Type=notify -EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-node +EnvironmentFile=/etc/sysconfig/{{ openshift_service_type }}-node Environment=GOTRACEBACK=crash ExecStartPre=/usr/bin/cp /etc/origin/node/node-dnsmasq.conf /etc/dnsmasq.d/ ExecStartPre=/usr/bin/dbus-send --system --dest=uk.org.thekelleys.dnsmasq /uk/org/thekelleys/dnsmasq uk.org.thekelleys.SetDomainServers array:string:/in-addr.arpa/127.0.0.1,/{{ openshift.common.dns_domain }}/127.0.0.1 ExecStopPost=/usr/bin/rm /etc/dnsmasq.d/node-dnsmasq.conf ExecStopPost=/usr/bin/dbus-send --system --dest=uk.org.thekelleys.dnsmasq /uk/org/thekelleys/dnsmasq uk.org.thekelleys.SetDomainServers array:string: -ExecStart=/usr/bin/openshift start node --config=${CONFIG_FILE} $OPTIONS +ExecStart=/usr/bin/openshift start node {% if openshift_node_bootstrap %} --kubeconfig=${KUBECONFIG} --bootstrap-config-name=${BOOTSTRAP_CONFIG_NAME}{% endif %} --config=${CONFIG_FILE} $OPTIONS LimitNOFILE=65536 LimitCORE=infinity WorkingDirectory=/var/lib/origin/ -SyslogIdentifier={{ openshift.common.service_type }}-node +SyslogIdentifier={{ openshift_service_type }}-node Restart=always RestartSec=5s TimeoutStartSec=300 |