Fix kube_hostname_override inconsistencies (#4185)

roles/kubernetes/kubeadm/defaults/main.yml

@@ -1,3 +1,10 @@
 ---
 # discovery_timeout modifies the discovery timeout
 discovery_timeout: 5m0s
+
+# If non-empty, will use this string as identification instead of the actual hostname
+kube_override_hostname: >-
+  {%- if cloud_provider is defined and cloud_provider in [ 'aws' ] -%}
+  {%- else -%}
+  {{ inventory_hostname }}
+  {%- endif -%}

roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2

@@ -15,7 +15,7 @@ discoveryTokenAPIServers:
 {% endif %}
 discoveryTokenUnsafeSkipCAVerification: true
 nodeRegistration:
-  name: {{ inventory_hostname  }}
+  name: {{ kube_override_hostname }}
 {% if container_manager == 'crio' %}
   criSocket: /var/run/crio/crio.sock
 {% elif container_manager == 'rkt' %}

roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha3.j2

@@ -15,7 +15,7 @@ discoveryTokenAPIServers:
 {% endif %}
 discoveryTokenUnsafeSkipCAVerification: true
 nodeRegistration:
-  name: {{ inventory_hostname  }}
+  name: {{ kube_override_hostname }}
 {% if container_manager == 'crio' %}
   criSocket: /var/run/crio/crio.sock
 {% elif container_manager == 'rkt' %}

roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2

@@ -13,7 +13,7 @@ discovery:
   tlsBootstrapToken: {{ kubeadm_token }}
 caCertPath: {{ kube_cert_dir }}/ca.crt
 nodeRegistration:
-  name: {{ inventory_hostname  }}
+  name: {{ kube_override_hostname }}
 {% if container_manager == 'crio' %}
   criSocket: /var/run/crio/crio.sock
 {% elif container_manager == 'rkt' %}