C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2610 from danielhoherd/master

Browse source 
Fix typos (no logic changes)
This commit is contained in:
RongZhang 2018-04-06 16:53:40 +08:00 committed by GitHub
commit 0210e53bb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
inventory/sample/group_vars/k8s-cluster.yml
View file

@ -1,8 +1,8 @@
# Kubernetes configuration dirs and system namespace. # Kubernetes configuration dirs and system namespace.
# Those are where all the additional config stuff goes # Those are where all the additional config stuff goes
# the kubernetes normally puts in /srv/kubernets. # the kubernetes normally puts in /srv/kubernetes.
# This puts them in a sane location and namespace. # 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_config_dir: /etc/kubernetes
kube_script_dir: "{{ bin_dir }}/kubernetes-scripts" kube_script_dir: "{{ bin_dir }}/kubernetes-scripts"
kube_manifest_dir: "{{ kube_config_dir }}/manifests" kube_manifest_dir: "{{ kube_config_dir }}/manifests"
@ -28,7 +28,7 @@ local_release_dir: "/tmp/releases"
retry_stagger: 5 retry_stagger: 5
# This is the group that the cert creation scripts chgrp the # This is the group that the cert creation scripts chgrp the
# cert files to. Not really changable... # cert files to. Not really changeable...
kube_cert_group: kube-cert kube_cert_group: kube-cert
# Cluster Loglevel configuration # Cluster Loglevel configuration

4
roles/kubernetes/preinstall/tasks/dhclient-hooks.yml
View file

@ -15,7 +15,7 @@
notify: Preinstall | restart network notify: Preinstall | restart network
when: dhclientconffile is defined when: dhclientconffile is defined
- name: Configue dhclient hooks for resolv.conf (non-RH) - name: Configure dhclient hooks for resolv.conf (non-RH)
template: template:
src: dhclient_dnsupdate.sh.j2 src: dhclient_dnsupdate.sh.j2
dest: "{{ dhclienthookfile }}" dest: "{{ dhclienthookfile }}"
@ -24,7 +24,7 @@
notify: Preinstall | restart network notify: Preinstall | restart network
when: ansible_os_family != "RedHat" when: ansible_os_family != "RedHat"
- name: Configue dhclient hooks for resolv.conf (RH-only) - name: Configure dhclient hooks for resolv.conf (RH-only)
template: template:
src: dhclient_dnsupdate_rh.sh.j2 src: dhclient_dnsupdate_rh.sh.j2
dest: "{{ dhclienthookfile }}" dest: "{{ dhclienthookfile }}"