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/master.docker.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/master.docker.service.j2')
| -rw-r--r-- | roles/openshift_master/templates/docker/master.docker.service.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/docker/master.docker.service.j2 b/roles/openshift_master/templates/docker/master.docker.service.j2 index f88262567..e9f4a4d21 100644 --- a/roles/openshift_master/templates/docker/master.docker.service.j2 +++ b/roles/openshift_master/templates/docker/master.docker.service.j2 @@ -1,8 +1,9 @@ [Unit] After=docker.service -Before={{ openshift.common.service_type }}-node.service Requires=docker.service PartOf=docker.service +After=etcd_container.service +Wants=etcd_container.service [Service] EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master |