feat(region): options: allow setting default vpc external access mode

yunionio · Nov 30, 2020 · 0ea12ff · 0ea12ff
1 parent f80c6a2
commit 0ea12ff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go
@@ -36,6 +36,7 @@ import (
 	"yunion.io/x/onecloud/pkg/cloudcommon/db/quotas"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/compute/options"
 	"yunion.io/x/onecloud/pkg/httperrors"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/util/rbacutils"
@@ -623,7 +624,13 @@ func (manager *SVpcManager) InitializeData() error {
 		}
 	}
 
-	{ // initialize default external_access_mode for onecloud vpc
+	if defaultMode := options.Options.DefaultVpcExternalAccessMode; defaultMode == "" {
+		options.Options.DefaultVpcExternalAccessMode = api.VPC_EXTERNAL_ACCESS_MODE_EIP_DISTGW
+	} else if !utils.IsInStringArray(defaultMode, api.VPC_EXTERNAL_ACCESS_MODES) {
+		return errors.Errorf("invalid DefaultVpcExternalAccessMode, got %s, want %s", defaultMode, api.VPC_EXTERNAL_ACCESS_MODES)
+	}
+	{
+		// initialize default external_access_mode for onecloud vpc
 		var vpcs []SVpc
 		q := manager.Query().
 			IsNullOrEmpty("manager_id").
@@ -635,7 +642,7 @@ func (manager *SVpcManager) InitializeData() error {
 		for i := range vpcs {
 			vpc := &vpcs[i]
 			if _, err := db.Update(vpc, func() error {
-				vpc.ExternalAccessMode = api.VPC_EXTERNAL_ACCESS_MODE_EIP_DISTGW
+				vpc.ExternalAccessMode = options.Options.DefaultVpcExternalAccessMode
 				return nil
 			}); err != nil {
 				return errors.Wrap(err, "db set default external_access_mode")
@@ -686,7 +693,7 @@ func (manager *SVpcManager) ValidateCreateData(
 	} else {
 		input.Status = api.VPC_STATUS_AVAILABLE
 		if input.ExternalAccessMode == "" {
-			input.ExternalAccessMode = api.VPC_EXTERNAL_ACCESS_MODE_EIP_DISTGW
+			input.ExternalAccessMode = options.Options.DefaultVpcExternalAccessMode
 		}
 		if !utils.IsInStringArray(input.ExternalAccessMode, api.VPC_EXTERNAL_ACCESS_MODES) {
 			return input, httperrors.NewInputParameterError("invalid external_access_mode %q, want %s",

diff --git a/pkg/compute/options/options.go b/pkg/compute/options/options.go
@@ -158,6 +158,8 @@ type ComputeOptions struct {
 
 	DefaultNetworkGatewayAddressEsxi uint32 `help:"Default address for network gateway" default:"1"`
 
+	DefaultVpcExternalAccessMode string `help:"default external access mode for on-premise vpc"`
+
 	NoCheckOsTypeForCachedImage bool `help:"Don't check os type for cached image"`
 
 	esxi.EsxiOptions