diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-12 11:24:02 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-06-12 11:24:02 -0400 |
| commit | 2d780c406038a6f0b3cc4c7a2326853c09a3caa0 (patch) | |
| tree | d4c1d4a2f9876146942b73d45be95276293dbd29 /roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 | |
| parent | dc12c4b28321e944b2fd3a35241510fd6513fcae (diff) | |
| download | openshift-2d780c406038a6f0b3cc4c7a2326853c09a3caa0.tar.gz openshift-2d780c406038a6f0b3cc4c7a2326853c09a3caa0.tar.bz2 openshift-2d780c406038a6f0b3cc4c7a2326853c09a3caa0.tar.xz openshift-2d780c406038a6f0b3cc4c7a2326853c09a3caa0.zip | |
Ensure that host pki tree is mounted in containerized components
Diffstat (limited to 'roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2')
| -rw-r--r-- | roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
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 451f3436a..69db62f16 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 @@ -11,7 +11,7 @@ PartOf={{ openshift.docker.service_name }}.service EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master-controllers Environment=GOTRACEBACK=crash ExecStartPre=-/usr/bin/docker rm -f {{ openshift.common.service_type}}-master-controllers -ExecStart=/usr/bin/docker run --rm --privileged --net=host --name {{ openshift.common.service_type }}-master-controllers --env-file=/etc/sysconfig/{{ openshift.common.service_type }}-master-controllers -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 }} {% if openshift_cloudprovider_kind | default('') != '' -%} -v {{ openshift.common.config_base }}/cloudprovider:{{ openshift.common.config_base}}/cloudprovider {% endif -%} {{ openshift.master.master_image }}:${IMAGE_VERSION} start master controllers --config=${CONFIG_FILE} $OPTIONS +ExecStart=/usr/bin/docker run --rm --privileged --net=host --name {{ openshift.common.service_type }}-master-controllers --env-file=/etc/sysconfig/{{ openshift.common.service_type }}-master-controllers -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 }} {% if openshift_cloudprovider_kind | default('') != '' -%} -v {{ openshift.common.config_base }}/cloudprovider:{{ openshift.common.config_base}}/cloudprovider {% endif -%} -v /etc/pki:/etc/pki:ro {{ openshift.master.master_image }}:${IMAGE_VERSION} start master controllers --config=${CONFIG_FILE} $OPTIONS ExecStartPost=/usr/bin/sleep 10 ExecStop=/usr/bin/docker stop {{ openshift.common.service_type }}-master-controllers LimitNOFILE=131072 |