github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 20:50:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6259 from zmerlynn/fix_cloud_provider

Browse Source 
Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack
This commit is contained in:
Derek Carr
2015-04-01 17:04:05 -04:00
parent d010b2a34e b581320bf7
commit 2af9b54147
4 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/salt.md
View File

@@ -53,7 +53,6 @@ Key | Value
`api_servers` | (Optional) The IP address / host name where a kubelet can get read-only access to kube-apiserver
`cbr-cidr` | (Optional) The minion IP address range used for the docker container bridge.
`cloud` | (Optional) Which IaaS platform is used to host kubernetes, *gce*, *azure*, *aws*, *vagrant*
`cloud_provider` | (Optional) The cloud_provider used by apiserver: *gce*, *azure*, *vagrant*
`etcd_servers` | (Optional) Comma-delimited list of IP addresses the kube-apiserver and kubelet use to reach etcd. Uses the IP of the first machine in the kubernetes_master role.
`hostnamef` | (Optional) The full host name of the machine, i.e. hostname -f
`node_ip` | (Optional) The IP address to use to address this node