diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-11 02:56:16 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-14 11:38:20 -0400 |
| commit | 8f7b31051dae0cdb853ca2f7fb68c31a40ae2967 (patch) | |
| tree | 6719a20fe3e1559c563985adc02332357e37e576 /roles/openshift_master/templates/native-cluster | |
| parent | 1565bc6e71bdda712d4cfdbf28754f00b38a4674 (diff) | |
| download | openshift-8f7b31051dae0cdb853ca2f7fb68c31a40ae2967.tar.gz openshift-8f7b31051dae0cdb853ca2f7fb68c31a40ae2967.tar.bz2 openshift-8f7b31051dae0cdb853ca2f7fb68c31a40ae2967.tar.xz openshift-8f7b31051dae0cdb853ca2f7fb68c31a40ae2967.zip | |
improve ordering of systemd units
Diffstat (limited to 'roles/openshift_master/templates/native-cluster')
2 files changed, 5 insertions, 6 deletions
diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2 index ba19fb348..e61418eb6 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2 @@ -1,10 +1,10 @@ [Unit] Description=Atomic OpenShift Master API Documentation=https://github.com/openshift/origin -After=network.target +After=network-online.target After=etcd.service Before={{ openshift.common.service_type }}-node.service -Requires=network.target +Requires=network-online.target [Service] Type=notify diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 index b393bb9ff..ba4c1e0e8 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 @@ -1,10 +1,10 @@ [Unit] Description=Atomic OpenShift Master Controllers Documentation=https://github.com/openshift/origin -After=network.target +After=network-online.target After={{ openshift.common.service_type }}-master-api.service -Before={{ openshift.common.service_type }}-node.service -Requires=network.target +Wants={{ openshift.common.service_type }}-master-api.service +Requires=network-online.target [Service] {% if openshift.common.version_gte_3_1_1_or_1_1_1 | bool %} @@ -23,4 +23,3 @@ Restart=on-failure [Install] WantedBy=multi-user.target -WantedBy={{ openshift.common.service_type }}-node.service |