Skip to content

Commit 1a38aff

Browse files
committed
chore(units): remove deprecated X-Condition from fleet units
See https://github.com/coreos/fleet/blob/19f64d1cec755d6eb01159830e0802b5225d12c8/job/job.go#L23-L37
1 parent 1da62d8 commit 1a38aff

10 files changed

Lines changed: 10 additions & 10 deletions

units/deis-builder-data.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ ExecStart=/bin/sh -c "docker inspect deis-builder-data >/dev/null 2>&1 || docker
1010
WantedBy=multi-user.target
1111

1212
[X-Fleet]
13-
X-ConditionMachineID=CHANGEME
13+
MachineID=CHANGEME

units/deis-builder.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ ExecStopPost=/usr/bin/docker stop deis-builder
1616
WantedBy=multi-user.target
1717

1818
[X-Fleet]
19-
X-ConditionMachineOf=deis-builder-data.service
19+
MachineOf=deis-builder-data.service

units/deis-controller.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ ExecStopPost=/usr/bin/docker stop deis-controller
1616
WantedBy=multi-user.target
1717

1818
[X-Fleet]
19-
X-ConditionMachineOf=deis-logger@1.service
19+
MachineOf=deis-logger@1.service

units/deis-database-data.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ ExecStart=/bin/sh -c "docker inspect deis-database-data >/dev/null 2>&1 || docke
1010
WantedBy=multi-user.target
1111

1212
[X-Fleet]
13-
X-ConditionMachineID=CHANGEME
13+
MachineID=CHANGEME

units/deis-database.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ ExecStopPost=/usr/bin/docker stop deis-database
1616
WantedBy=multi-user.target
1717

1818
[X-Fleet]
19-
X-ConditionMachineOf=deis-database-data.service
19+
MachineOf=deis-database-data.service

units/deis-logger-data.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ ExecStart=/bin/sh -c "docker inspect deis-logger-data >/dev/null 2>&1 || docker
1010
WantedBy=multi-user.target
1111

1212
[X-Fleet]
13-
X-ConditionMachineID=CHANGEME
13+
MachineID=CHANGEME

units/deis-logger.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ ExecStopPost=/usr/bin/docker stop deis-logger
1515
WantedBy=multi-user.target
1616

1717
[X-Fleet]
18-
X-ConditionMachineOf=deis-logger-data.service
18+
MachineOf=deis-logger-data.service

units/deis-registry-data.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ ExecStart=/bin/sh -c "docker inspect deis-registry-data >/dev/null 2>&1 || docke
1010
WantedBy=multi-user.target
1111

1212
[X-Fleet]
13-
X-ConditionMachineID=CHANGEME
13+
MachineID=CHANGEME

units/deis-registry.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ ExecStopPost=/usr/bin/docker stop deis-registry
1616
WantedBy=multi-user.target
1717

1818
[X-Fleet]
19-
X-ConditionMachineOf=deis-registry-data.service
19+
MachineOf=deis-registry-data.service

units/deis-router.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ ExecStopPost=/usr/bin/docker stop deis-router
1313
WantedBy=multi-user.target
1414

1515
[X-Fleet]
16-
X-Conflicts=deis-router@*.service
16+
Conflicts=deis-router@*.service

0 commit comments

Comments
 (0)