Просмотр исходного кода

Merge pull request #10466 from tomassedovic/openstack-remove-hostname-override

Remove hostname override from OpenStack inventory
Scott Dodson 6 лет назад
Родитель
Сommit
3a54367372
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['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
 
     if server.metadata['host-type'] == 'cns':