Merge pull request #3608 from xichengliudui/fix181030

Correct the wrong word
This commit is contained in:
Rong Zhang 2018-10-30 20:52:02 +08:00 committed by GitHub
commit 22c234040e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -69,9 +69,9 @@ dns_servers: "{{kube_dns_servers[dns_mode]}}"
# 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"
@ -87,7 +87,7 @@ kube_users_dir: "{{ kube_config_dir }}/users"
# 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
@ -234,7 +234,7 @@ kubeconfig_localhost: false
# Download kubectl onto the host that runs Ansible in {{ bin_dir }} # Download kubectl onto the host that runs Ansible in {{ bin_dir }}
kubectl_localhost: false kubectl_localhost: false
# Define credentials_dir here so it can be overriden # Define credentials_dir here so it can be overridden
credentials_dir: "{{ inventory_dir }}/credentials" credentials_dir: "{{ inventory_dir }}/credentials"
# K8s image pull policy (imagePullPolicy) # K8s image pull policy (imagePullPolicy)