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

Improve admin docs syntax highlighting.

Browse Source
This commit is contained in:
Alex Robinson
2015-07-19 05:43:48 +00:00
parent 91923b51c8
commit 3364a32dc6
10 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/admin/salt.md
View File

@@ -45,7 +45,7 @@ The **salt-minion** service runs on the kubernetes-master node and each kubernet
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).
```
```console
[root@kubernetes-master] $ cat /etc/salt/minion.d/master.conf
master: kubernetes-master
```
@@ -66,7 +66,7 @@ All remaining sections that refer to master/minion setups should be ignored for
Security is not enabled on the salt-master, and the salt-master is configured to auto-accept incoming requests from minions. It is not recommended to use this security configuration in production environments without deeper study. (In some environments this isn't as bad as it might sound if the salt master port isn't externally accessible and you trust everyone on your network.)
```
```console
[root@kubernetes-master] $ cat /etc/salt/master.d/auto-accept.conf
open_mode: True
auto_accept: True
@@ -78,7 +78,7 @@ Each minion in the salt cluster has an associated configuration that instructs t
An example file is presented below using the Vagrant based environment.
```
```console
[root@kubernetes-master] $ cat /etc/salt/minion.d/grains.conf
grains:
etcd_servers: $MASTER_IP