From b69977460b3d4cc954f75f06887f3eeb2233ac99 Mon Sep 17 00:00:00 2001 From: tangbin Date: Tue, 1 Jan 2019 17:07:43 +0800 Subject: [PATCH] fix merge --- cmd/lbagent/main.go | 3 --- pkg/compute/models/cloudproviders.go | 4 ---- pkg/compute/options/options.go | 3 --- pkg/compute/tasks/cloud_account_sync_task.go | 15 --------------- 4 files changed, 25 deletions(-) diff --git a/cmd/lbagent/main.go b/cmd/lbagent/main.go index 2a5ea7c757..54df012389 100644 --- a/cmd/lbagent/main.go +++ b/cmd/lbagent/main.go @@ -9,13 +9,10 @@ import ( "yunion.io/x/log" "yunion.io/x/onecloud/pkg/cloudcommon" - "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/lbagent" ) func main() { - consts.SetServiceType("lbagent") - opts := &lbagent.Options{} commonOpts := &opts.CommonOpts { diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 93f8ca7fe8..5095aa9f9f 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -46,10 +46,6 @@ var ( CLOUD_PROVIDER_VALID_STATUS = []string{CLOUD_PROVIDER_CONNECTED, CLOUD_PROVIDER_START_SYNC, CLOUD_PROVIDER_SYNCING} ) -var ( - CLOUD_PROVIDER_VALID_STATUS = []string{CLOUD_PROVIDER_CONNECTED, CLOUD_PROVIDER_START_SYNC, CLOUD_PROVIDER_SYNCING} -) - type SCloudproviderManager struct { db.SEnabledStatusStandaloneResourceBaseManager } diff --git a/pkg/compute/options/options.go b/pkg/compute/options/options.go index 068d359b47..148e4ec0a5 100644 --- a/pkg/compute/options/options.go +++ b/pkg/compute/options/options.go @@ -27,9 +27,6 @@ type ComputeOptions struct { PrepaidExpireCheckSeconds int `default:"600" help:"How long to wait to scan expired prepaid VM or disks, default is 10 minutes"` ExpiredPrepaidMaxCleanBatchSize int `default:"50" help:"How many expired prepaid servers can be deleted in a batch"` - PrepaidExpireCheckSeconds int `default:"600" help:"How long to wait to scan expired prepaid VM or disks, default is 10 minutes"` - ExpiredPrepaidMaxCleanBatchSize int `default:"50" help:"How many expired prepaid servers can be deleted in a batch"` - LoadbalancerPendingDeleteCheckInterval int `default:"3600" help:"Interval between checks of pending deleted loadbalancer objects, defaults to 1h"` ImageCacheStoragePolicy string `default:"least_used" choices:"best_fit|least_used" help:"Policy to choose storage for image cache, best_fit or least_used"` diff --git a/pkg/compute/tasks/cloud_account_sync_task.go b/pkg/compute/tasks/cloud_account_sync_task.go index 0ffcf2ef83..6806cf5508 100644 --- a/pkg/compute/tasks/cloud_account_sync_task.go +++ b/pkg/compute/tasks/cloud_account_sync_task.go @@ -7,7 +7,6 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" - "yunion.io/x/onecloud/pkg/compute/skus" ) type CloudAccountSyncInfoTask struct { @@ -83,20 +82,6 @@ func (self *CloudAccountSyncInfoTask) OnCloudaccountSyncComplete(ctx context.Con if account != nil { account.SetStatus(self.UserCred, models.CLOUD_PROVIDER_CONNECTED, "") } - - if models.ServerSkuManager.GetSkuCountByProvider(cloudprovider.Provider) == 0 { - // sync skus - self.SetStage("OnSyncServerSkuComplete", nil) - taskman.LocalTaskRun(self, func() (jsonutils.JSONObject, error) { - err := skus.SyncSkusByProviderIds([]string{cloudprovider.Provider}) - return nil, err - }) - return - } } self.SetStageComplete(ctx, nil) } - -func (self *CloudAccountSyncInfoTask) OnSyncServerSkuComplete(ctx context.Context, items []db.IStandaloneModel, data jsonutils.JSONObject) { - self.SetStageComplete(ctx, nil) -}