Merge pull request #1845 from carmstrong/remove_deprecated_condition

chore(*/systemd): remove deprecated X-Condition in fleet units

Author: carmstrong

builder/systemd/deis-builder-data.service.template

@@ -10,4 +10,4 @@ ExecStart=/bin/sh -c "docker inspect deis-builder-data >/dev/null 2>&1 || docker
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-ConditionMachineID=CHANGEME
+MachineID=CHANGEME

builder/systemd/deis-builder.service

@@ -16,4 +16,4 @@ ExecStopPost=/usr/bin/docker stop deis-builder
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-ConditionMachineOf=deis-builder-data.service
+MachineOf=deis-builder-data.service

controller/scheduler/coreos.py

@@ -135,7 +135,7 @@ def _create_container(self, name, image, command, unit, **kwargs):
         tags = kwargs.get('tags', {})
         if tags:
             tagset = ' '.join(['"{}={}"'.format(k, v) for k, v in tags.items()])
-            unit.append({"section": "X-Fleet", "name": "X-ConditionMachineMetadata",
+            unit.append({"section": "X-Fleet", "name": "MachineMetadata",
                          "value": tagset})
         # post unit to fleet
         self._put_unit(name, {"desiredState": "launched", "options": unit})
@@ -325,7 +325,7 @@ def attach(self, name):
     {"section": "Service", "name": "ExecStartPre", "value": '''/bin/sh -c "until docker inspect {name} >/dev/null 2>&1; do sleep 1; done"'''},  # noqa
     {"section": "Service", "name": "ExecStart", "value": '''/bin/sh -c "docker logs -f {name} 2>&1 | logger -p local0.info -t {app}[{c_type}.{c_num}] --udp --server $(etcdctl get /deis/logs/host) --port $(etcdctl get /deis/logs/port)"'''},  # noqa
     {"section": "Service", "name": "TimeoutStartSec", "value": "20m"},
-    {"section": "X-Fleet", "name": "X-ConditionMachineOf", "value": "{name}.service"},
+    {"section": "X-Fleet", "name": "MachineOf", "value": "{name}.service"},
 ]
 
 
@@ -337,7 +337,7 @@ def attach(self, name):
     {"section": "Service", "name": "ExecStart", "value": '''/bin/sh -c "port=$(docker inspect -f '{{{{range $i, $e := .NetworkSettings.Ports }}}}{{{{$p := index $e 0}}}}{{{{$p.HostPort}}}}{{{{end}}}}' {name}); echo Connected to $COREOS_PRIVATE_IPV4:$port/tcp, publishing to etcd...; while netstat -lnt | grep :$port >/dev/null; do etcdctl set /deis/services/{app}/{name} $COREOS_PRIVATE_IPV4:$port --ttl 60 >/dev/null; sleep 45; done"'''},  # noqa
     {"section": "Service", "name": "ExecStop", "value": "/usr/bin/etcdctl rm --recursive /deis/services/{app}/{name}"},  # noqa
     {"section": "Service", "name": "TimeoutStartSec", "value": "20m"},
-    {"section": "X-Fleet", "name": "X-ConditionMachineOf", "value": "{name}.service"},
+    {"section": "X-Fleet", "name": "MachineOf", "value": "{name}.service"},
 ]
 
 

controller/systemd/deis-controller.service

@@ -15,4 +15,4 @@ ExecStopPost=/usr/bin/docker stop deis-controller
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-ConditionMachineOf=deis-logger.service
+MachineOf=deis-logger.service

database/systemd/deis-database-data.service.template

@@ -10,4 +10,4 @@ ExecStart=/bin/sh -c "docker inspect deis-database-data >/dev/null 2>&1 || docke
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-ConditionMachineID=CHANGEME
+MachineID=CHANGEME

database/systemd/deis-database.service

@@ -16,4 +16,4 @@ ExecStopPost=/usr/bin/docker stop deis-database
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-ConditionMachineOf=deis-database-data.service
+MachineOf=deis-database-data.service

logger/systemd/deis-logger-data.service.template

@@ -10,4 +10,4 @@ ExecStart=/bin/sh -c "docker inspect deis-logger-data >/dev/null 2>&1 || docker
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-ConditionMachineID=CHANGEME
+MachineID=CHANGEME

logger/systemd/deis-logger.service

@@ -15,4 +15,4 @@ ExecStopPost=/usr/bin/docker stop deis-logger
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-ConditionMachineOf=deis-logger-data.service
+MachineOf=deis-logger-data.service

registry/systemd/deis-registry-data.service.template

@@ -10,4 +10,4 @@ ExecStart=/bin/sh -c "docker inspect deis-registry-data >/dev/null 2>&1 || docke
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-ConditionMachineID=CHANGEME
+MachineID=CHANGEME

registry/systemd/deis-registry.service

@@ -16,4 +16,4 @@ ExecStopPost=/usr/bin/docker stop deis-registry
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-ConditionMachineOf=deis-registry-data.service
+MachineOf=deis-registry-data.service