Merge branch 'master' into master

This commit is contained in:
zoues
2017-05-23 09:32:28 +08:00
committed by GitHub
68 changed files with 507 additions and 332 deletions

View File

@@ -42,9 +42,6 @@ kube_script_dir: "{{ bin_dir }}/kubernetes-scripts"
kube_manifest_dir: "{{ kube_config_dir }}/manifests"
system_namespace: kube-system
# Logging directory (sysvinit systems)
kube_log_dir: "/var/log/kubernetes"
# This is where all the cert scripts and certs will be located
kube_cert_dir: "{{ kube_config_dir }}/ssl"