github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Split out the hostname when default dhcp_domain is used in nova.conf"

Browse Source 
This reverts commit 9a8c6db448.
This commit is contained in:
Jordan Liggitt
2018-05-15 22:47:02 -04:00
parent ccc3eb2c31
commit 2f48ad3ff5
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cloudprovider/providers/openstack/openstack_instances.go
View File

@@ -20,7 +20,6 @@ import (
"context" "context"
"fmt" "fmt"
"regexp" "regexp"
"strings"
"github.com/golang/glog" "github.com/golang/glog"
"github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud"
@@ -62,7 +61,7 @@ func (i *Instances) CurrentNodeName(ctx context.Context, hostname string) (types
if err != nil { if err != nil {
return "", err return "", err
} }
return types.NodeName(strings.Split(md.Hostname, ".")[0]), nil return types.NodeName(md.Hostname), nil
} }
// AddSSHKeyToAllInstances is not implemented for OpenStack // AddSSHKeyToAllInstances is not implemented for OpenStack