github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 23:19:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2369 from jbeda/vagrant-fix

Browse Source 
Vagrant fixes
This commit is contained in:
Joe Beda
2014-11-14 16:43:06 -08:00
parent e84ba3c184 5a0159ea00
commit 06d838ffb1
12 changed files with 65 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/salt.md
View File

@@ -52,7 +52,7 @@ The following enumerates the set of defined key/value pairs that are supported t
Key | Value
------------- | -------------
`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*
`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 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