Skip to content

Commit a8d4f99

Browse files
committed
Merge pull request #3422 from carmstrong/fleet-v0.9.2
chore(contrib/coreos): upgrade fleet to 0.9.2
2 parents 22179b9 + 3f3eba4 commit a8d4f99

1 file changed

Lines changed: 18 additions & 1 deletion

File tree

contrib/coreos/user-data.example

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,18 @@ coreos:
3232
Restart=always
3333
RestartSec=10s
3434
LimitNOFILE=40000
35-
- name: fleet.service
35+
- name: upgrade-fleet-091.service
3636
command: start
37+
content: |
38+
[Unit]
39+
Description=Upgrade fleet if system fleet is v0.9.1, which has a known bug
40+
Before=fleet.service
41+
ConditionPathIsSymbolicLink=!/etc/systemd/system/fleet.service.d/99-upgrade-fleet-091.conf
42+
43+
[Service]
44+
ExecStart=/usr/bin/bash -c 'if fleetd --version | grep -q 0.9.1; then curl -sSL --retry 5 --retry-delay 2 -o /run/deis/bin/fleetd-0.9.2 https://s3-us-west-2.amazonaws.com/opdemand/fleetd-v0.9.2 && chmod +x /run/deis/bin/fleetd-0.9.2 && mkdir -p /etc/systemd/system/fleet.service.d/ && ln -s /run/deis/conf/fleetd-092-custom-binary.conf /etc/systemd/system/fleet.service.d/99-upgrade-fleet-091.conf; else rm -f /etc/systemd/system/fleet.service.d/99-upgrade-fleet-091.conf; fi'
45+
RemainAfterExit=yes
46+
Type=oneshot
3747
- name: stop-update-engine.service
3848
command: start
3949
content: |
@@ -97,6 +107,8 @@ coreos:
97107

98108
[Service]
99109
ExecStart=/bin/bash -c "lsmod | grep overlay || modprobe overlay"
110+
- name: fleet.service
111+
command: start
100112
write_files:
101113
- path: /etc/deis-release
102114
content: |
@@ -195,3 +207,8 @@ write_files:
195207
[Service]
196208
ExecStart=
197209
ExecStart=/usr/sbin/ntpd -g -n -f /var/lib/ntp/ntp.drift
210+
- path: /run/deis/conf/fleetd-092-custom-binary.conf
211+
content: |
212+
[Service]
213+
ExecStart=
214+
ExecStart=/run/deis/bin/fleetd-0.9.2

0 commit comments

Comments
 (0)