diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-09 17:00:00 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-16 09:03:35 -0500 |
| commit | afa4fd5799b0ff43d625d061e4c2bde66b5fb86a (patch) | |
| tree | 2654bb42deb7dcd3b907b1476ec0fbe55c133fb2 /roles/openshift_node_upgrade/templates/node.service.j2 | |
| parent | 8a85bc3a00efb654238a58e1faa2a2629d9360b1 (diff) | |
| download | openshift-afa4fd5799b0ff43d625d061e4c2bde66b5fb86a.tar.gz openshift-afa4fd5799b0ff43d625d061e4c2bde66b5fb86a.tar.bz2 openshift-afa4fd5799b0ff43d625d061e4c2bde66b5fb86a.tar.xz openshift-afa4fd5799b0ff43d625d061e4c2bde66b5fb86a.zip | |
Combine openshift_node and openshift_node_upgrade
Currently, having openshift_node and openshift_node_upgrade
as two distinct roles has created a duplication across
handlers, templates, and some tasks.
This commit combines the roles to reduce duplication
and bugs encountered by not putting code in both places.
Diffstat (limited to 'roles/openshift_node_upgrade/templates/node.service.j2')
| -rw-r--r-- | roles/openshift_node_upgrade/templates/node.service.j2 | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/roles/openshift_node_upgrade/templates/node.service.j2 b/roles/openshift_node_upgrade/templates/node.service.j2 deleted file mode 100644 index e12a52c15..000000000 --- a/roles/openshift_node_upgrade/templates/node.service.j2 +++ /dev/null @@ -1,31 +0,0 @@ -[Unit] -Description=OpenShift Node -After={{ openshift.docker.service_name }}.service -Wants=openvswitch.service -After=ovsdb-server.service -After=ovs-vswitchd.service -Wants={{ openshift.docker.service_name }}.service -Documentation=https://github.com/openshift/origin -Requires=dnsmasq.service -After=dnsmasq.service - -[Service] -Type=notify -EnvironmentFile=/etc/sysconfig/{{ openshift.common.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 -LimitNOFILE=65536 -LimitCORE=infinity -WorkingDirectory=/var/lib/origin/ -SyslogIdentifier={{ openshift.common.service_type }}-node -Restart=always -RestartSec=5s -TimeoutStartSec=300 -OOMScoreAdjust=-999 - -[Install] -WantedBy=multi-user.target |