From 3fd2f714ce50cfc133da2d1c70970f13e111df87 Mon Sep 17 00:00:00 2001 From: Menno van Gangelen Date: Wed, 2 May 2018 00:46:10 +0200 Subject: [PATCH 1/2] Actually depend on var-lib-etcd2.mount service to be active --- core/controlplane/config/templates/cloud-config-etcd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/controlplane/config/templates/cloud-config-etcd b/core/controlplane/config/templates/cloud-config-etcd index fc077436f..6bbba06b9 100644 --- a/core/controlplane/config/templates/cloud-config-etcd +++ b/core/controlplane/config/templates/cloud-config-etcd @@ -151,6 +151,7 @@ coreos: Wants=cfn-etcd-environment.service After=cfn-etcd-environment.service After=network.target + After=var-lib-etcd2.mount [Service] Type=oneshot @@ -158,7 +159,7 @@ coreos: RestartSec=5 EnvironmentFile=-/etc/etcd-environment EnvironmentFile=-/var/run/coreos/etcdadm-environment - ExecStartPre=/usr/bin/systemctl is-active format-etcd2-volume.service + ExecStartPre=/usr/bin/systemctl is-active var-lib-etcd2.mount ExecStartPre=/usr/bin/systemctl is-active cfn-etcd-environment.service ExecStartPre=/usr/bin/mkdir -p /var/run/coreos/etcdadm/snapshots ExecStart=/opt/bin/etcdadm reconfigure From 889e48b3d5014a3cac691b7fb7b210038c29344c Mon Sep 17 00:00:00 2001 From: Menno van Gangelen Date: Wed, 2 May 2018 00:46:44 +0200 Subject: [PATCH 2/2] remove potential circular dependency --- core/controlplane/config/templates/cloud-config-etcd | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/controlplane/config/templates/cloud-config-etcd b/core/controlplane/config/templates/cloud-config-etcd index 6bbba06b9..a291fdbfb 100644 --- a/core/controlplane/config/templates/cloud-config-etcd +++ b/core/controlplane/config/templates/cloud-config-etcd @@ -168,9 +168,6 @@ coreos: {{end -}} TimeoutStartSec=120 - [Install] - WantedBy=cfn-etcd-environment.service - - name: etcdadm-update-status.service enable: true content: |