diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 13:22:13 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 13:22:13 -0400 |
| commit | 238171804159ca5127b0a4d419bc7489b0fa8ab4 (patch) | |
| tree | 9777b16283726b27cb23cc682e68305de6bc1cb3 /roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 | |
| parent | 00ccce6741369f5cffdcca2a9511c57e3aff4b47 (diff) | |
| parent | 8f7b31051dae0cdb853ca2f7fb68c31a40ae2967 (diff) | |
| download | openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.tar.gz openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.tar.bz2 openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.tar.xz openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.zip | |
Merge pull request #1550 from detiber/docker_refactor
Docker role refactor
Diffstat (limited to 'roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2')
| -rw-r--r-- | roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 index 915c0cb8c..4fc48ba15 100644 --- a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 +++ b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 @@ -1,9 +1,9 @@ [Unit] Description=Atomic OpenShift Master Controllers Documentation=https://github.com/openshift/origin -After=network.target +Wants={{ openshift.common.service_type }}-master-api.service After={{ openshift.common.service_type }}-master-api.service -Before={{ openshift.common.service_type }}-node.service +After=docker.service Requires=docker.service PartOf=docker.service @@ -22,4 +22,3 @@ Restart=on-failure [Install] WantedBy=multi-user.target -WantedBy={{ openshift.common.service_type }}-node.service |