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

pkg/cloudprovider/providers/openstack/metadata.go

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

pkg/cloudprovider/providers/openstack/metadata_test.go

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

pkg/cloudprovider/providers/openstack/openstack_instances.go

@@ -60,7 +60,7 @@ func (i *Instances) CurrentNodeName(ctx context.Context, hostname string) (types
 	if err != nil {
 		return "", err
 	}
-	return types.NodeName(md.Hostname), nil
+	return types.NodeName(md.Name), nil
 }
 
 // AddSSHKeyToAllInstances is not implemented for OpenStack