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

Merge pull request #11424 from lavalamp/mungePreformatted

Browse Source 
Munge preformatted
This commit is contained in:
Abhi Shah
2015-07-17 13:32:38 -07:00
parent 3ae4a021ef 2c046685f6
commit 816f18a388
95 changed files with 629 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/admin/salt.md
View File

@@ -48,6 +48,7 @@ Each salt-minion service is configured to interact with the **salt-master** serv
[root@kubernetes-master] $ cat /etc/salt/minion.d/master.conf
master: kubernetes-master
```
The salt-master is contacted by each salt-minion and depending upon the machine information presented, the salt-master will provision the machine as either a kubernetes-master or kubernetes-minion with all the required capabilities needed to run Kubernetes.
If you are running the Vagrant based environment, the **salt-api** service is running on the kubernetes-master. It is configured to enable the vagrant user to introspect the salt cluster in order to find out about machines in the Vagrant environment via a REST API.