diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-16 12:37:55 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-16 12:37:55 -0400 |
| commit | a9967650345248b3bd89f2420c83e1cbefeafff1 (patch) | |
| tree | f70c3c2a6ef037b8feda883d8cf32dfe7991c1fd /roles/openshift_master/templates/docker/master.docker.service.j2 | |
| parent | 5c9b706a756aad9676b74ccfd15959e2e8307047 (diff) | |
| parent | 406887d16fb14b806c28cb52a600aaca5d966608 (diff) | |
| download | openshift-a9967650345248b3bd89f2420c83e1cbefeafff1.tar.gz openshift-a9967650345248b3bd89f2420c83e1cbefeafff1.tar.bz2 openshift-a9967650345248b3bd89f2420c83e1cbefeafff1.tar.xz openshift-a9967650345248b3bd89f2420c83e1cbefeafff1.zip | |
Merge pull request #1624 from sdodson/bz1317975
Load environment files in containerized installs
Diffstat (limited to 'roles/openshift_master/templates/docker/master.docker.service.j2')
| -rw-r--r-- | roles/openshift_master/templates/docker/master.docker.service.j2 | 2 |
1 files changed, 1 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 e9f4a4d21..b714fdeb7 100644 --- a/roles/openshift_master/templates/docker/master.docker.service.j2 +++ b/roles/openshift_master/templates/docker/master.docker.service.j2 @@ -8,7 +8,7 @@ Wants=etcd_container.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 }}:${IMAGE_VERSION} start master --config=${CONFIG_FILE} $OPTIONS +ExecStart=/usr/bin/docker run --rm --privileged --net=host --name {{ openshift.common.service_type }}-master --env-file=/etc/sysconfig/{{ 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 }}:${IMAGE_VERSION} start master --config=${CONFIG_FILE} $OPTIONS ExecStartPost=/usr/bin/sleep 10 ExecStop=/usr/bin/docker stop {{ openshift.common.service_type }}-master Restart=always |