External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-19 04:00:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

merge with current master, update typos in doc

Browse Source
This commit is contained in:
Spencer Smith
2016-08-24 09:56:42 -04:00
parent 60f263b629 439a2e2678
commit 4e76bced53
8 changed files with 22 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
View File

@@ -17,7 +17,7 @@ spec:
- --root-ca-file={{ kube_cert_dir }}/ca.pem
- --enable-hostpath-provisioner={{ kube_hostpath_dynamic_provisioner }}
- --v={{ kube_log_level | default('2') }}
{% if cloud_provider is defined and cloud_provider == "openstack"%}
{% if cloud_provider is defined and cloud_provider == "openstack" %}
- --cloud-provider={{cloud_provider}}
- --cloud-config={{ kube_config_dir }}/cloud_config
{% elif cloud_provider is defined and cloud_provider == "aws" %}