Merge pull request #10395 from mgugino-upstream-stage/reset-nodename-override

Fail on openshift_kubelet_name_override for new hosts.

playbooks/init/cluster_facts.yml

@@ -28,7 +28,7 @@
     openshift_facts:
       role: common
       local_facts:
-        hostname: "{{ (openshift_kubelet_name_override | default(None)) if l_openshift_upgrade_in_progress else None }}"
+        hostname: "{{ openshift_kubelet_name_override | default(None) }}"
         ip: "{{ openshift_ip | default(None) }}"
         public_hostname: "{{ openshift_public_hostname | default(None) }}"
         public_ip: "{{ openshift_public_ip | default(None) }}"
@@ -64,7 +64,7 @@
         sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}"
   - name: set_fact l_kubelet_node_name
     set_fact:
-      l_kubelet_node_name: "{{ openshift_kubelet_name_override if (openshift_kubelet_name_override is defined and l_openshift_upgrade_in_progress) else openshift.node.nodename }}"
+      l_kubelet_node_name: "{{ openshift_kubelet_name_override | default(openshift.node.nodename) }}"
 
 - name: Initialize etcd host variables
   hosts: oo_masters_to_config

playbooks/prerequisites.yml

@@ -1,5 +1,12 @@
 ---
 # l_scale_up_hosts may be passed in via various scaleup plays.
+- name: Fail openshift_kubelet_name_override for new hosts
+  hosts: "{{ l_scale_up_hosts | default('nodes') }}"
+  tasks:
+  - name: Fail when openshift_kubelet_name_override is defined
+    fail:
+      msg: "openshift_kubelet_name_override Cannot be defined for new hosts"
+    when: openshift_kubelet_name_override is defined
 
 - import_playbook: init/main.yml
   vars:

roles/openshift_facts/defaults/main.yml

@@ -230,4 +230,3 @@ openshift_node_group_edits_crio:
       - "10m"
 
 openshift_master_manage_htpasswd: True
-l_openshift_upgrade_in_progress: False