瀏覽代碼

Remove hostname override from OpenStack inventory

The pull request #10395 enabled failures for any new deployments that
use `openshift_kubelet_name_override`.

We were using this for certain non-DNS deployments, but have since
switched to always requiring internal DNS of some sorts just like all
the other cloud providers.

So the variable is no longer necessary and indeed breaks OpenStack-based
cloud deployments.

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1641085
Tomas Sedovic 6 年之前
父節點
當前提交
4ab010374e
共有 1 個文件被更改,包括 0 次插入7 次删除
  1. 0 7
      playbooks/openstack/resources.py

+ 0 - 7
playbooks/openstack/resources.py

@@ -96,13 +96,6 @@ def _get_hostvars(server, docker_storage_mountpoints):
         hostvars['private_v4'] = private_v4
         hostvars['private_v4'] = private_v4
         hostvars['openshift_ip'] = private_v4
         hostvars['openshift_ip'] = private_v4
 
 
-        # NOTE(shadower): Yes, we set both hostname and IP to the private
-        # IP address for each node. OpenStack doesn't resolve nodes by
-        # name at all, so using a hostname here would require an internal
-        # DNS which would complicate the setup and potentially introduce
-        # performance issues.
-        hostvars['openshift_kubelet_name_override'] = server.metadata.get(
-            'openshift_kubelet_name_override', private_v4)
     hostvars['openshift_public_hostname'] = server.name
     hostvars['openshift_public_hostname'] = server.name
 
 
     if server.metadata['host-type'] == 'cns':
     if server.metadata['host-type'] == 'cns':