diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-29 09:51:49 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-29 09:51:49 -0400 |
| commit | 6d74968b30f3dff2046ab50330c2de55ac103a8b (patch) | |
| tree | c041d2afa708846e83041d86a9792f724838a49e /roles/openshift_master | |
| parent | 8946d80f76b8fe9c243f9f3ea2f7df801d25e837 (diff) | |
| parent | 93d48b330e500bd45a91c4dc7dc3d89fd000dfc4 (diff) | |
| download | openshift-6d74968b30f3dff2046ab50330c2de55ac103a8b.tar.gz openshift-6d74968b30f3dff2046ab50330c2de55ac103a8b.tar.bz2 openshift-6d74968b30f3dff2046ab50330c2de55ac103a8b.tar.xz openshift-6d74968b30f3dff2046ab50330c2de55ac103a8b.zip | |
Merge pull request #1671 from sjenning/systemd-unit-fixes
make docker service want ose containerized services
Diffstat (limited to 'roles/openshift_master')
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 index 6a21a04ab..5e6577d95 100644 --- a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 +++ b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 @@ -22,5 +22,5 @@ SyslogIdentifier={{ openshift.common.service_type }}-master-api Restart=always [Install] -WantedBy=multi-user.target +WantedBy=docker.service WantedBy={{ openshift.common.service_type }}-node.service 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 69f68d843..04c84a84a 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 @@ -21,4 +21,4 @@ SyslogIdentifier={{ openshift.common.service_type }}-master-controllers Restart=on-failure [Install] -WantedBy=multi-user.target +WantedBy=docker.service diff --git a/roles/openshift_master/templates/docker/master.docker.service.j2 b/roles/openshift_master/templates/docker/master.docker.service.j2 index b714fdeb7..6bd0dcf56 100644 --- a/roles/openshift_master/templates/docker/master.docker.service.j2 +++ b/roles/openshift_master/templates/docker/master.docker.service.j2 @@ -14,4 +14,4 @@ ExecStop=/usr/bin/docker stop {{ openshift.common.service_type }}-master Restart=always [Install] -WantedBy=multi-user.target +WantedBy=docker.service |