External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-23 16:47:47 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add support to Ansible 2.9 (#5361)

Browse Source
This commit is contained in:
Maxime Guyot
2019-12-05 16:24:32 +01:00
committed by Kubernetes Prow Robot
parent 7da2083986
commit b15d41a96a
27 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/kubernetes/preinstall/tasks/0060-resolvconf.yml
View File

@@ -1,7 +1,7 @@
---
- name: create temporary resolveconf cloud init file
command: cp -f /etc/resolv.conf "{{ resolvconffile }}"
when: ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS"]
- name: Add domain/search/nameservers/options to resolv.conf
blockinfile:
@@ -47,7 +47,7 @@
- name: get temporary resolveconf cloud init file content
command: cat {{ resolvconffile }}
register: cloud_config
when: ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS"]
- name: persist resolvconf cloud init file
template:
@@ -56,4 +56,4 @@
owner: root
mode: 0644
notify: Preinstall | update resolvconf for Container Linux by CoreOS
when: ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]
when: ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS"]