Minor fixup for etcd unit files

tyrannasaurusbanks · Apr 11, 2017 · 9b5053d · 9b5053d
1 parent 51f50ad
commit 9b5053d
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/core/controlplane/config/templates/cloud-config-etcd b/core/controlplane/config/templates/cloud-config-etcd
@@ -83,10 +83,9 @@ coreos:
         Description=etcd health check
 
         [Service]
-        Type=simple
+        Type=oneshot
         EnvironmentFile=-/etc/etcd-environment
         EnvironmentFile=-/var/run/coreos/etcdadm-environment
-        Restart=no
         ExecStartPre=/usr/bin/systemctl is-active {{.Etcd.SystemdUnitName}}
         ExecStart=/opt/bin/etcdadm check
         TimeoutStartSec=120
@@ -115,10 +114,9 @@ coreos:
         Description=etcd snapshot
 
         [Service]
-        Type=simple
+        Type=oneshot
         EnvironmentFile=-/etc/etcd-environment
         EnvironmentFile=-/var/run/coreos/etcdadm-environment
-        Restart=no
         ExecStartPre=/usr/bin/systemctl is-active {{.Etcd.SystemdUnitName}}
         ExecStart=/opt/bin/etcdadm save
         TimeoutStartSec=300
@@ -251,13 +249,12 @@ coreos:
       command: start
       content: |
         [Unit]
-        Wants={{.Etcd.SystemdUnitName}}
+        Requires={{.Etcd.SystemdUnitName}}
         After={{.Etcd.SystemdUnitName}}
 
         [Service]
         Type=oneshot
         EnvironmentFile={{.EtcdNodeEnvFileName}}
-        ExecStartPre=/usr/bin/systemctl is-active {{.Etcd.SystemdUnitName}}
         ExecStart=/opt/bin/cfn-signal
 {{end}}