Merge pull request #1018 from priteau/openstack-state-fix

Properly return error when invalid instance state is found

Merge pull request #1018 from priteau/openstack-state-fix
Properly return error when invalid instance state is found
fd4dd284 · Ross Smith II · 57c3b8d9 · 77dedd9e · fd4dd284
Commit fd4dd284 authored Apr 21, 2014 by Ross Smith II
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

builder/openstack/server.go builder/openstack/server.go +1 -2

No files found.
--- a/builder/openstack/server.go
+++ b/builder/openstack/server.go
@@ -75,8 +75,7 @@ func WaitForState(conf *StateChangeConf) (i interface{}, err error) {
 		}
 		if !found {
-			fmt.Errorf("unexpected state '%s', wanted target '%s'", currentState, conf.Target)
+			return nil, fmt.Errorf("unexpected state '%s', wanted target '%s'", currentState, conf.Target)
-			return
 		}
 		log.Printf("Waiting for state to become: %s currently %s (%d%%)", conf.Target, currentState, currentProgress)