Merge pull request #1027 from hvnsweeting/master

Multiples doc fixes
This commit is contained in:
Antoine Legrand 2017-02-14 11:39:22 +01:00 committed by GitHub
commit 93cb5a5bd6
3 changed files with 5 additions and 4 deletions

View file

@ -8,7 +8,7 @@ The inventory is composed of 3 groups:
* **kube-node** : list of kubernetes nodes where the pods will run.
* **kube-master** : list of servers where kubernetes master components (apiserver, scheduler, controller) will run.
* **etcd**: list of server to compose the etcd server. you should have at least 3 servers for failover purposes.
* **etcd**: list of servers to compose the etcd server. You should have at least 3 servers for failover purpose.
Note: do not modify the children of _k8s-cluster_, like putting
the _etcd_ group into the _k8s-cluster_, unless you are certain

View file

@ -21,7 +21,7 @@ kargo deploy --aws -u centos -n calico
Building your own inventory
---------------------------
Ansible inventory can be stored in 3 formats: YAML, JSON, or inifile. There is
Ansible inventory can be stored in 3 formats: YAML, JSON, or INI-like. There is
an example inventory located
[here](https://github.com/kubernetes-incubator/kargo/blob/master/inventory/inventory.example).
@ -47,8 +47,9 @@ Starting custom deployment
Once you have an inventory, you may want to customize deployment data vars
and start the deployment:
**IMPORTANT: Edit my_inventory/groups_vars/*.yaml to override data vars**
```
# Edit my_inventory/groups_vars/*.yaml to override data vars
ansible-playbook -i my_inventory/inventory.cfg cluster.yaml -b -v \
--private-key=~/.ssh/private_key
```

View file

@ -8,7 +8,7 @@ bin_dir: /usr/local/bin
# Those are where all the additional config stuff goes
# the kubernetes normally puts in /srv/kubernets.
# This puts them in a sane location and namespace.
# Editting those values will almost surely break something.
# Editing those values will almost surely break something.
kube_config_dir: /etc/kubernetes
kube_script_dir: "{{ bin_dir }}/kubernetes-scripts"
kube_manifest_dir: "{{ kube_config_dir }}/manifests"