Skip to content
This repository has been archived by the owner on Sep 30, 2020. It is now read-only.

Fix etcd startup #1270

Merged
merged 2 commits into from
May 2, 2018
Merged

Fix etcd startup #1270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fd2f71
Actually depend on var-lib-etcd2.mount service to be active
Confushion May 1, 2018
889e48b
remove potential circular dependency
Confushion May 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions core/controlplane/config/templates/cloud-config-etcd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,15 @@ coreos:
Wants=cfn-etcd-environment.service
After=cfn-etcd-environment.service
After=network.target
After=var-lib-etcd2.mount

[Service]
Type=oneshot
RemainAfterExit=yes
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
Expand All @@ -167,9 +168,6 @@ coreos:
{{end -}}
TimeoutStartSec=120

[Install]
WantedBy=cfn-etcd-environment.service

- name: etcdadm-update-status.service
enable: true
content: |
Expand Down