Merge branch 'master' into etcddockerdefault

roles/etcd/tasks/main.yml

@@ -1,5 +1,4 @@
 ---
-- include: set_facts.yml
 - include: install.yml
 - include: set_cluster_health.yml
 - include: configure.yml

roles/kubernetes/node/defaults/main.yml

@@ -29,6 +29,9 @@ kube_log_dir: "/var/log/kubernetes"
 
 dns_domain: "{{ cluster_name }}"
 
+# resolv.conf to base dns config
+kube_resolv_conf: "/etc/resolv.conf"
+
 kube_proxy_mode: iptables
 
 # An experimental dev/test only dynamic volumes provisioner,

roles/kubernetes/node/templates/kubelet.j2

@@ -21,7 +21,7 @@ KUBELET_REGISTER_NODE="--register-node=false"
 {% endif %}
 # location of the api-server
 {% if dns_setup %}
-KUBELET_ARGS="--cluster_dns={{ dns_server }} --cluster_domain={{ dns_domain }} --kubeconfig={{ kube_config_dir}}/node-kubeconfig.yaml --config={{ kube_manifest_dir }}"
+KUBELET_ARGS="--cluster_dns={{ dns_server }} --cluster_domain={{ dns_domain }} --kubeconfig={{ kube_config_dir}}/node-kubeconfig.yaml --config={{ kube_manifest_dir }} --resolv-conf={{ kube_resolv_conf }}"
 {% else %}
 KUBELET_ARGS="--kubeconfig={{ kube_config_dir}}/kubelet.kubeconfig --config={{ kube_manifest_dir }}"
 {% endif %}

roles/kubernetes/preinstall/tasks/main.yml

@@ -2,6 +2,8 @@
 - include: gitinfos.yml
   when: run_gitinfos
 
+- include: set_facts.yml
+
 - name: gather os specific variables
   include_vars: "{{ item }}"
   with_first_found: