github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Openstack: register metadata.hostname as node name"

Browse Source 
This reverts commit eaac0f5489.
This commit is contained in:
Jordan Liggitt 2018-05-15 22:49:21 -04:00
parent 2f48ad3ff5
commit 6ab76041b7
No known key found for this signature in database
GPG Key ID: 39928704103C7229
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/providers/openstack/metadata.go
View File

@ -70,7 +70,7 @@ type DeviceMetadata struct {
// See http://docs.openstack.org/user-guide/cli_config_drive.html // See http://docs.openstack.org/user-guide/cli_config_drive.html
type Metadata struct { type Metadata struct {
UUID string `json:"uuid"` UUID string `json:"uuid"`
Hostname string `json:"hostname"` Name string `json:"name"`
AvailabilityZone string `json:"availability_zone"` AvailabilityZone string `json:"availability_zone"`
Devices []DeviceMetadata `json:"devices,omitempty"` Devices []DeviceMetadata `json:"devices,omitempty"`
// .. and other fields we don't care about. Expand as necessary. // .. and other fields we don't care about. Expand as necessary.

6
pkg/cloudprovider/providers/openstack/metadata_test.go
View File

@ -23,7 +23,7 @@ import (
var FakeMetadata = Metadata{ var FakeMetadata = Metadata{
UUID: "83679162-1378-4288-a2d4-70e13ec132aa", UUID: "83679162-1378-4288-a2d4-70e13ec132aa",
Hostname: "test", Name: "test",
AvailabilityZone: "nova", AvailabilityZone: "nova",
} }
@ -81,8 +81,8 @@ func TestParseMetadata(t *testing.T) {
t.Fatalf("Should succeed when provided with valid data: %s", err) t.Fatalf("Should succeed when provided with valid data: %s", err)
} }
if md.Hostname != "test.novalocal" { if md.Name != "test" {
t.Errorf("incorrect hostname: %s", md.Hostname) t.Errorf("incorrect name: %s", md.Name)
} }
if md.UUID != "83679162-1378-4288-a2d4-70e13ec132aa" { if md.UUID != "83679162-1378-4288-a2d4-70e13ec132aa" {

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

@ -61,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(md.Hostname), nil return types.NodeName(md.Name), nil
} }
// AddSSHKeyToAllInstances is not implemented for OpenStack // AddSSHKeyToAllInstances is not implemented for OpenStack