diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2016-01-20 15:01:38 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-20 15:01:38 -0500 |
| commit | 9410cdff9342fae80a3149c530b819e473996cce (patch) | |
| tree | cf26be9b05f3b97dbdafb7bae109b0707da0a0d4 /roles/openshift_master/templates/docker | |
| parent | a2b745039bce597d419b03fdce39b4c6c69139f6 (diff) | |
| parent | bdedb63403ea582c4aaa5f56caed302f51744de2 (diff) | |
| download | openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.gz openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.bz2 openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.xz openshift-9410cdff9342fae80a3149c530b819e473996cce.zip | |
Merge pull request #1247 from openshift/master
Merge master into prod
Diffstat (limited to 'roles/openshift_master/templates/docker')
| -rw-r--r-- | roles/openshift_master/templates/docker/master.docker.service.j2 | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/docker/master.docker.service.j2 b/roles/openshift_master/templates/docker/master.docker.service.j2 new file mode 100644 index 000000000..23781a313 --- /dev/null +++ b/roles/openshift_master/templates/docker/master.docker.service.j2 @@ -0,0 +1,16 @@ +[Unit] +After=docker.service +Before={{ openshift.common.service_type }}-node.service +Requires=docker.service +PartOf=docker.service + +[Service] +EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master +ExecStartPre=-/usr/bin/docker rm -f {{ openshift.common.service_type }}-master +ExecStart=/usr/bin/docker run --rm --privileged --net=host --name {{ openshift.common.service_type }}-master -v {{ openshift.common.data_dir }}:{{ openshift.common.data_dir }} -v /var/run/docker.sock:/var/run/docker.sock -v {{ openshift.common.config_base }}:{{ openshift.common.config_base }} {{ openshift.master.master_image }} start master --config=${CONFIG_FILE} $OPTIONS +ExecStartPost=/usr/bin/sleep 10 +ExecStop=/usr/bin/docker stop {{ openshift.common.service_type }}-master +Restart=always + +[Install] +WantedBy=multi-user.target |