diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-07 08:40:16 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-07 08:40:16 -0400 |
| commit | 43358890013b2e5756ea2621e393f3b689c97239 (patch) | |
| tree | 2557227aabfc53f047e0087caabafe721565505a /roles/openshift_master/templates/docker/master.docker.service.j2 | |
| parent | 6bae44332be495310dca9520518bf5d0776ae4c8 (diff) | |
| parent | 50cfd30752b3f70b3417f122f4e7a3ffd0f4cdd1 (diff) | |
| download | openshift-43358890013b2e5756ea2621e393f3b689c97239.tar.gz openshift-43358890013b2e5756ea2621e393f3b689c97239.tar.bz2 openshift-43358890013b2e5756ea2621e393f3b689c97239.tar.xz openshift-43358890013b2e5756ea2621e393f3b689c97239.zip | |
Merge pull request #1722 from abutcher/containerized-cloudprovider
Add cloudprovider config dir to docker options.
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 6bd0dcf56..d02fc5342 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 --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 +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 }} {% 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 --config=${CONFIG_FILE} $OPTIONS ExecStartPost=/usr/bin/sleep 10 ExecStop=/usr/bin/docker stop {{ openshift.common.service_type }}-master Restart=always |