Merge pull request #917 from mattymo/rkt_resolvconf

Fix setting resolvconf when using rkt deploy mode
This commit is contained in:
Matthew Mosesohn 2017-01-19 18:30:21 +03:00 committed by GitHub
commit 9d2d08404d

View file

@ -17,16 +17,16 @@
default_resolver: >- default_resolver: >-
{%- if cloud_provider is defined and cloud_provider == 'gce' -%}169.254.169.254{%- else -%}8.8.8.8{%- endif -%} {%- if cloud_provider is defined and cloud_provider == 'gce' -%}169.254.169.254{%- else -%}8.8.8.8{%- endif -%}
- name: check kubelet - name: check if kubelet is configured
stat: stat:
path: "{{ bin_dir }}/kubelet" path: "{{ kube_config_dir }}/kubelet.env"
register: kubelet register: kubelet_configured
changed_when: false changed_when: false
- name: check if early DNS configuration stage - name: check if early DNS configuration stage
set_fact: set_fact:
dns_early: >- dns_early: >-
{%- if kubelet.stat.exists -%}false{%- else -%}true{%- endif -%} {%- if kubelet_configured.stat.exists -%}false{%- else -%}true{%- endif -%}
- name: target resolv.conf files - name: target resolv.conf files
set_fact: set_fact: