From 2f48ad3ff5b31261e31b11c94ac203169405393a Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 15 May 2018 22:47:02 -0400 Subject: [PATCH] Revert "Split out the hostname when default dhcp_domain is used in nova.conf" This reverts commit 9a8c6db448f200ddd9a06813affab804b183de20. --- pkg/cloudprovider/providers/openstack/openstack_instances.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/cloudprovider/providers/openstack/openstack_instances.go b/pkg/cloudprovider/providers/openstack/openstack_instances.go index 0cf1a9a6dd6..d852ccb27a2 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_instances.go +++ b/pkg/cloudprovider/providers/openstack/openstack_instances.go @@ -20,7 +20,6 @@ import ( "context" "fmt" "regexp" - "strings" "github.com/golang/glog" "github.com/gophercloud/gophercloud" @@ -62,7 +61,7 @@ func (i *Instances) CurrentNodeName(ctx context.Context, hostname string) (types if err != nil { return "", err } - return types.NodeName(strings.Split(md.Hostname, ".")[0]), nil + return types.NodeName(md.Hostname), nil } // AddSSHKeyToAllInstances is not implemented for OpenStack