Browse Source
Merge pull request #3335 from AtzeDeVries/fix/ubuntu-xenial-resolv-conf
Fix/ubuntu xenial resolv conf
pull/3370/head
k8s-ci-robot
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
13 additions and
0 deletions
-
roles/kubernetes/node/tasks/facts.yml
-
roles/kubernetes/node/vars/ubuntu-18.yml
|
|
@ -8,3 +8,14 @@ |
|
|
standalone_kubelet: >- |
|
|
standalone_kubelet: >- |
|
|
{%- if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] -%}true{%- else -%}false{%- endif -%} |
|
|
{%- if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] -%}true{%- else -%}false{%- endif -%} |
|
|
kubelet_cgroup_driver_detected: "{{ docker_cgroup_driver_result.stdout }}" |
|
|
kubelet_cgroup_driver_detected: "{{ docker_cgroup_driver_result.stdout }}" |
|
|
|
|
|
|
|
|
|
|
|
- name: os specific vars |
|
|
|
|
|
include_vars: "{{ item }}" |
|
|
|
|
|
with_first_found: |
|
|
|
|
|
- files: |
|
|
|
|
|
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_version|lower|replace('/', '_') }}.yml" |
|
|
|
|
|
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}.yml" |
|
|
|
|
|
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version|lower|replace('/', '_') }}.yml" |
|
|
|
|
|
- "{{ ansible_distribution|lower }}.yml" |
|
|
|
|
|
- "{{ ansible_os_family|lower }}.yml" |
|
|
|
|
|
skip: true |
|
|
@ -0,0 +1,2 @@ |
|
|
|
|
|
--- |
|
|
|
|
|
kube_resolv_conf: "/run/systemd/resolve/resolv.conf" |
