Automatic merge from release/2.5.0 -> release/2.6.0

* commit '7690cefbc7ffc6070a2d1b51c47261699ab1cf7d':
  mark zone as enabled at initlization

pkg/compute/models/zones.go

@@ -17,6 +17,7 @@ import (
 )
 
 const (
+	ZONE_INIT    = "init"
 	ZONE_ENABLE  = "enable"
 	ZONE_DISABLE = "disable"
 	ZONE_SOLDOUT = "soldout"
@@ -469,7 +470,7 @@ func (manager *SZoneManager) InitializeData() error {
 				return nil
 			})
 		}
-		if z.Status == "init" {
+		if z.Status == ZONE_INIT || z.Status == ZONE_DISABLE {
 			manager.TableSpec().Update(&z, func() error {
 				z.Status = ZONE_ENABLE
 				return nil