diff options
author | Andrew Butcher <abutcher@redhat.com> | 2016-04-06 11:33:58 -0400 |
---|---|---|
committer | Andrew Butcher <abutcher@redhat.com> | 2016-04-06 11:33:58 -0400 |
commit | 50cfd30752b3f70b3417f122f4e7a3ffd0f4cdd1 (patch) | |
tree | 4da5c7ea46f135d3d1eb0a5fe6aa0a04a90d6d96 /roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 | |
parent | 6cd266510dfa5423ae9af60ba191ff3aa1016100 (diff) | |
download | openshift-50cfd30752b3f70b3417f122f4e7a3ffd0f4cdd1.tar.gz openshift-50cfd30752b3f70b3417f122f4e7a3ffd0f4cdd1.tar.bz2 openshift-50cfd30752b3f70b3417f122f4e7a3ffd0f4cdd1.tar.xz openshift-50cfd30752b3f70b3417f122f4e7a3ffd0f4cdd1.zip |
Add cloudprovider config dir to docker options.
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 04c84a84a..75759c133 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=docker.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 }} {{ 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 'cloudprovider' in openshift and 'kind' in openshift.cloudprovider and openshift.cloudprovider.kind != '' -%} -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 ExecStartPost=/usr/bin/sleep 10 ExecStop=/usr/bin/docker stop {{ openshift.common.service_type }}-master-controllers LimitNOFILE=131072 |