Merge pull request #31618 from sjenning/fix-externalid-error

Automatic merge from submit-queue return cloudprovider.InstanceNotFound for Instance interface ExternalID() Fixes #31615 @kubernetes/rh-cluster-infra @ncdc @anguslees

Merge pull request #31618 from sjenning/fix-externalid-error
fe08d0ad · Kubernetes Submit Queue · GitHub · 8a77e3fd · bde39666 · fe08d0ad
Commit fe08d0ad authored Sep 11, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

openstack_instances.go pkg/cloudprovider/providers/openstack/openstack_instances.go +3 -0

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_instances.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_instances.go
@@ -136,6 +136,9 @@ func (i *Instances) NodeAddresses(name string) ([]api.NodeAddress, error) {
 func (i *Instances) ExternalID(name string) (string, error) {
 	srv, err := getServerByName(i.compute, name)
 	if err != nil {
+		if err == ErrNotFound {
+			return "", cloudprovider.InstanceNotFound
+		}
 		return "", err
 	}
 	return srv.ID, nil