From c2b3920b50ccc9aff694fc31935a1b22ab0283fd Mon Sep 17 00:00:00 2001 From: Martin Joehren Date: Fri, 30 Jun 2017 12:17:03 +0000 Subject: [PATCH] added flag for not populating inventory entries to etc hosts file --- roles/kubernetes/preinstall/defaults/main.yml | 5 ++++- roles/kubernetes/preinstall/tasks/etchosts.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/kubernetes/preinstall/defaults/main.yml b/roles/kubernetes/preinstall/defaults/main.yml index dd5cbf810..686c0e9bc 100644 --- a/roles/kubernetes/preinstall/defaults/main.yml +++ b/roles/kubernetes/preinstall/defaults/main.yml @@ -32,7 +32,7 @@ openstack_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}" # For the vsphere integration, kubelet will need credentials to access # vsphere apis -# Documentation regarting these values can be found +# Documentation regarding these values can be found # https://github.com/kubernetes/kubernetes/blob/master/pkg/cloudprovider/providers/vsphere/vsphere.go#L105 vsphere_vcenter_ip: "{{ lookup('env', 'VSPHERE_VCENTER') }}" vsphere_vcenter_port: "{{ lookup('env', 'VSPHERE_VCENTER_PORT') }}" @@ -49,3 +49,6 @@ vsphere_public_network: "{{ lookup('env', 'VSPHERE_PUBLIC_NETWORK')|default('') # Container Linux by 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 + +# All inventory hostnames will be written into each /etc/hosts file. +populate_inventory_to_hosts_file: true diff --git a/roles/kubernetes/preinstall/tasks/etchosts.yml b/roles/kubernetes/preinstall/tasks/etchosts.yml index df330be08..69496b7c2 100644 --- a/roles/kubernetes/preinstall/tasks/etchosts.yml +++ b/roles/kubernetes/preinstall/tasks/etchosts.yml @@ -9,6 +9,7 @@ create: yes backup: yes marker: "# Ansible inventory hosts {mark}" + when: populate_inventory_to_hosts_file - name: Hosts | populate kubernetes loadbalancer address into hosts file lineinfile: