diff --git a/docs/admin/salt.md b/docs/admin/salt.md index e921b4a877..884f01b772 100644 --- a/docs/admin/salt.md +++ b/docs/admin/salt.md @@ -39,9 +39,9 @@ The Salt scripts are shared across multiple hosting providers, so it's important ## Salt cluster setup -The **salt-master** service runs on the kubernetes-master node [(except on the default GCE setup)](#standalone-salt-configuration-on-gce). +The **salt-master** service runs on the kubernetes-master [(except on the default GCE setup)](#standalone-salt-configuration-on-gce). -The **salt-minion** service runs on the kubernetes-master node and each kubernetes-minion node in the cluster. +The **salt-minion** service runs on the kubernetes-master and each kubernetes-node in the cluster. Each salt-minion service is configured to interact with the **salt-master** service hosted on the kubernetes-master via the **master.conf** file [(except on GCE)](#standalone-salt-configuration-on-gce). @@ -50,7 +50,7 @@ Each salt-minion service is configured to interact with the **salt-master** serv 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. +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-node 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. @@ -103,7 +103,7 @@ Key | Value `network_mode` | (Optional) Networking model to use among nodes: *openvswitch* `networkInterfaceName` | (Optional) Networking interface to use to bind addresses, default value *eth0* `publicAddressOverride` | (Optional) The IP address the kube-apiserver should use to bind against for external read-only access -`roles` | (Required) 1. `kubernetes-master` means this machine is the master in the Kubernetes cluster. 2. `kubernetes-pool` means this machine is a kubernetes-minion. Depending on the role, the Salt scripts will provision different resources on the machine. +`roles` | (Required) 1. `kubernetes-master` means this machine is the master in the Kubernetes cluster. 2. `kubernetes-pool` means this machine is a kubernetes-node. Depending on the role, the Salt scripts will provision different resources on the machine. These keys may be leveraged by the Salt sls files to branch behavior.