github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/apiservers/api_servers/ in Salt

Browse Source 
It looks like api_servers finally won this battle. Kill off the
last remaining places passing it, but allow the kubelet Salt to
accept apiservers for a period of time.

(This was bothering my OCD.)
This commit is contained in:
Zach Loafman
2015-03-31 12:27:32 -07:00
parent 9ed87612d0
commit 6c219885e0
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/salt.md
View File

@@ -51,7 +51,7 @@ The following enumerates the set of defined key/value pairs that are supported t
Key | Value
------------- | -------------
`apiservers` | (Optional) The IP address / host name where a kubelet can get read-only access to kube-apiserver
`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*