Merge pull request #248 from deniseschannon/upgradefix

Confirm previous upgrade when starting the next upgrade
rancher · Apr 27, 2017 · 88b67b0 · 88b67b0
2 parents b80ddd8 + 8b12456
commit 88b67b0
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/rancher/service.go b/rancher/service.go
@@ -118,6 +118,17 @@ func (r *RancherService) up(create bool) error {
 			}
 		}
 
+		if service.State == "upgraded" {
+			service, err = r.context.Client.Service.ActionFinishupgrade(service)
+			if err != nil {
+				return err
+			}
+			err = r.Wait(service)
+			if err != nil {
+				return err
+			}
+		}
+
 		service, err = r.upgrade(service, r.context.ForceUpgrade, r.context.Args)
 		if err != nil {
 			return err