openstack: Return instance name in CurrentNodeName

Previously the OpenStack provider just returned the hostname in CurrentNodeName. With this change, we return the local OpenStack instance name, as the API intended.

openstack: Return instance name in CurrentNodeName
8167df29 · Angus Lees · 3745e0f8 · 8167df29
Commit 8167df29 authored Aug 30, 2016 by Angus Lees
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

openstack_instances.go pkg/cloudprovider/providers/openstack/openstack_instances.go +6 -1

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_instances.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_instances.go
@@ -113,8 +113,13 @@ func (i *Instances) List(name_filter string) ([]types.NodeName, error) {
 }

 // Implementation of Instances.CurrentNodeName
+// Note this is *not* necessarily the same as hostname.
 func (i *Instances) CurrentNodeName(hostname string) (types.NodeName, error) {
-	return types.NodeName(hostname), nil
+	md, err := getMetadata()
+	if err != nil {
+		return "", err
+	}
+	return types.NodeName(md.Name), nil
 }

 func (i *Instances) AddSSHKeyToAllInstances(user string, keyData []byte) error {