Browse Source
Merge pull request #2610 from danielhoherd/master
Fix typos (no logic changes)
pull/2618/head
RongZhang
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
5 deletions
-
inventory/sample/group_vars/k8s-cluster.yml
-
roles/kubernetes/preinstall/tasks/dhclient-hooks.yml
|
|
|
@ -1,8 +1,8 @@ |
|
|
|
# Kubernetes configuration dirs and system namespace. |
|
|
|
# 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. |
|
|
|
# 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" |
|
|
|
@ -28,7 +28,7 @@ local_release_dir: "/tmp/releases" |
|
|
|
retry_stagger: 5 |
|
|
|
|
|
|
|
# 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 |
|
|
|
|
|
|
|
# Cluster Loglevel configuration |
|
|
|
|
|
|
|
@ -15,7 +15,7 @@ |
|
|
|
notify: Preinstall | restart network |
|
|
|
when: dhclientconffile is defined |
|
|
|
|
|
|
|
- name: Configue dhclient hooks for resolv.conf (non-RH) |
|
|
|
- name: Configure dhclient hooks for resolv.conf (non-RH) |
|
|
|
template: |
|
|
|
src: dhclient_dnsupdate.sh.j2 |
|
|
|
dest: "{{ dhclienthookfile }}" |
|
|
|
@ -24,7 +24,7 @@ |
|
|
|
notify: Preinstall | restart network |
|
|
|
when: ansible_os_family != "RedHat" |
|
|
|
|
|
|
|
- name: Configue dhclient hooks for resolv.conf (RH-only) |
|
|
|
- name: Configure dhclient hooks for resolv.conf (RH-only) |
|
|
|
template: |
|
|
|
src: dhclient_dnsupdate_rh.sh.j2 |
|
|
|
dest: "{{ dhclienthookfile }}" |
|
|
|
|
