diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-03-16 11:51:58 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-03-16 11:51:58 -0400 |
| commit | 406887d16fb14b806c28cb52a600aaca5d966608 (patch) | |
| tree | e02c90516041ad13a4d42691066fb3475d1ffa51 /roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 | |
| parent | e47d3f806da7db924dd8d9e0e533c1a59868fa16 (diff) | |
| download | openshift-406887d16fb14b806c28cb52a600aaca5d966608.tar.gz openshift-406887d16fb14b806c28cb52a600aaca5d966608.tar.bz2 openshift-406887d16fb14b806c28cb52a600aaca5d966608.tar.xz openshift-406887d16fb14b806c28cb52a600aaca5d966608.zip | |
Load environment files in containerized installs
Diffstat (limited to 'roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2')
| -rw-r--r-- | roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 | 2 |
1 files changed, 1 insertions, 1 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 f777f7657..6a21a04ab 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 @@ -12,7 +12,7 @@ Requires=docker.service EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master-api Environment=GOTRACEBACK=crash ExecStartPre=-/usr/bin/docker rm -f {{ openshift.common.service_type}}-master-api -ExecStart=/usr/bin/docker run --rm --privileged --net=host --name {{ openshift.common.service_type }}-master-api -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 api --config=${CONFIG_FILE} $OPTIONS +ExecStart=/usr/bin/docker run --rm --privileged --net=host --name {{ openshift.common.service_type }}-master-api --env-file=/etc/sysconfig/{{ openshift.common.service_type }}-master-api -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 api --config=${CONFIG_FILE} $OPTIONS ExecStartPost=/usr/bin/sleep 10 ExecStop=/usr/bin/docker stop {{ openshift.common.service_type }}-master-api LimitNOFILE=131072 |