Browse code
improve systemd unit ordering
- Use network-online.target instead of network.target
- Remove extraneous After for master unit from node units
- Added an After for openvswitch to node units
- Added PartOf docker to all containerized units
Jason DeTiberus authored on 2016/03/12 00:43:51Showing 7 changed files
- contrib/systemd/atomic-openshift-master.service
- contrib/systemd/atomic-openshift-node.service
- contrib/systemd/containerized/openvswitch.service
- contrib/systemd/containerized/origin-master.service
- contrib/systemd/containerized/origin-node.service
- contrib/systemd/origin-master.service
- contrib/systemd/origin-node.service
| ... | ... |
@@ -1,10 +1,10 @@ |
| 1 | 1 |
[Unit] |
| 2 | 2 |
Description=Atomic OpenShift Master |
| 3 | 3 |
Documentation=https://github.com/openshift/origin |
| 4 |
-After=network.target |
|
| 4 |
+After=network-online.target |
|
| 5 | 5 |
After=etcd.service |
| 6 | 6 |
Before=atomic-openshift-node.service |
| 7 |
-Requires=network.target |
|
| 7 |
+Requires=network-online.target |
|
| 8 | 8 |
|
| 9 | 9 |
[Service] |
| 10 | 10 |
Type=notify |
| ... | ... |
@@ -1,7 +1,9 @@ |
| 1 | 1 |
[Unit] |
| 2 | 2 |
After=docker.service |
| 3 | 3 |
Before=origin-node.service |
| 4 |
+PartOf=docker.service |
|
| 4 | 5 |
Requires=docker.service |
| 6 |
+After=etcd.service |
|
| 5 | 7 |
|
| 6 | 8 |
|
| 7 | 9 |
[Service] |
| ... | ... |
@@ -14,3 +16,4 @@ Restart=always |
| 14 | 14 |
|
| 15 | 15 |
[Install] |
| 16 | 16 |
WantedBy=multi-user.target |
| 17 |
+WantedBy=origin-node.service |
| ... | ... |
@@ -1,10 +1,10 @@ |
| 1 | 1 |
[Unit] |
| 2 | 2 |
Description=Origin Master Service |
| 3 | 3 |
Documentation=https://github.com/openshift/origin |
| 4 |
-After=network.target |
|
| 4 |
+After=network-online.target |
|
| 5 | 5 |
After=etcd.service |
| 6 | 6 |
Before=origin-node.service |
| 7 |
-Requires=network.target |
|
| 7 |
+Requires=network-online.target |
|
| 8 | 8 |
|
| 9 | 9 |
[Service] |
| 10 | 10 |
Type=notify |