Merge pull request #649 from bogdando/coreos_resolvconf

Ensure /etc/resolv.conf content for CoreOS

roles/dnsmasq/defaults/main.yml

@@ -11,6 +11,10 @@
 #nameservers:
 #  - 127.0.0.1
 
+# CoreOS cloud init config file to define /etc/resolv.conf content
+# for hostnet pods and infra needs
+resolveconf_cloud_init_conf: /etc/resolveconf_cloud_init.conf
+
 # Versions
 dnsmasq_version: 2.72
 

roles/dnsmasq/handlers/main.yml

@@ -21,11 +21,23 @@
   notify:
     - Dnsmasq | reload resolvconf
     - Dnsmasq | reload kubelet
+  when: ansible_os_family != "CoreOS"
+
+- name: Dnsmasq | update resolvconf for CoreOS
+  command: /bin/true
+  notify:
+    - Dnsmasq | apply resolvconf cloud-init
+    - Dnsmasq | reload kubelet
+  when: ansible_os_family == "CoreOS"
 
 - name: Dnsmasq | reload resolvconf
   command: /sbin/resolvconf -u
   ignore_errors: true
 
+- name: Dnsmasq | apply resolvconf cloud-init
+  command: /usr/bin/coreos-cloudinit --from-file {{ resolveconf_cloud_init_conf }}
+  when: ansible_os_family == "CoreOS"
+
 - name: Dnsmasq | reload kubelet
   service:
     name: kubelet

roles/dnsmasq/tasks/resolvconf.yml

@@ -9,6 +9,16 @@
   set_fact:
     resolvconffile: >-
       {%- if resolvconf.rc == 0 -%}/etc/resolvconf/resolv.conf.d/head{%- else -%}/etc/resolv.conf{%- endif -%}
+  when: ansible_os_family != "CoreOS"
+
+- name: target temporary resolvconf cloud init file
+  set_fact:
+    resolvconffile: /tmp/resolveconf_cloud_init_conf
+  when: ansible_os_family == "CoreOS"
+
+- name: create temporary resolveconf cloud init file
+  command: cp -f /etc/resolv.conf "{{ resolvconffile }}"
+  when: ansible_os_family == "CoreOS"
 
 - name: generate search domains to resolvconf
   set_fact:
@@ -100,3 +110,17 @@
   copy: src=dhclient_nodnsupdate dest=/etc/dhcp/dhclient.d/nodnsupdate mode=u+x
   notify: Dnsmasq | restart network
   when: ansible_os_family == "RedHat"
+
+- name: get temporary resolveconf cloud init file content
+  command: cat {{ resolvconffile }}
+  register: cloud_config
+  when: ansible_os_family == "CoreOS"
+
+- name: persist resolvconf cloud init file
+  template:
+    dest: "{{resolveconf_cloud_init_conf}}"
+    src: resolvconf.j2
+    owner: root
+    mode: 0644
+  notify: Dnsmasq | update resolvconf for CoreOS
+  when: ansible_os_family == "CoreOS"

roles/dnsmasq/templates/resolvconf.j2

+#cloud-config
+write_files:
+  - path: "/etc/resolv.conf"
+    permissions: "0644"
+    owner: "root"
+    content: |
+    {% for l in cloud_config.stdout_lines %}
+      {{ l }}
+    {% endfor %}
+    #