opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7202 from yousong/bugfix/yousong-lbagent-deploy

Browse Source 
Bugfix/yousong lbagent deploy
This commit is contained in:
Zexi Li
2020-07-17 10:15:03 +08:00
committed by GitHub
parent c7e95a82f8 afac0604db
commit 7697e5faaf
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/loadbalanceragents_deploy.go
+18 -2
View File
@@ -114,6 +114,8 @@ func (lbagent *SLoadbalancerAgent) deploy(ctx context.Context, userCred mcclient
}
switch input.DeployMethod {
case compute_apis.DeployMethodYum:
fallthrough
default:
if v, ok := input.Host.GetVar("repo_base_url"); !ok || v == "" {
return nil, httperrors.NewBadRequestError("use yum requires valid repo_base_url")
}
@@ -142,8 +144,6 @@ func (lbagent *SLoadbalancerAgent) deploy(ctx context.Context, userCred mcclient
},
)
case compute_apis.DeployMethodCopy:
fallthrough
default:
// glob for rpms
basenames := []string{
"packages/telegraf",
@@ -275,6 +275,22 @@ func (lbagent *SLoadbalancerAgent) validateHost(ctx context.Context, userCred mc
if utils.IsInStringArray(guest.Hypervisor, compute_apis.PUBLIC_CLOUD_HYPERVISORS) {
return httperrors.NewBadRequestError("lbagent cannot be deployed on public guests")
}
if guest.Status != compute_apis.VM_RUNNING {
return httperrors.NewBadRequestError("server is in %q state, want %q",
guest.Status, compute_apis.VM_RUNNING)
}
// Better make this explicit in the API
if guest.SrcIpCheck.Bool() || guest.SrcMacCheck.Bool() {
sess := auth.GetSession(ctx, userCred, "", "")
params := jsonutils.NewDict()
params.Set("src_ip_check", jsonutils.JSONFalse)
params.Set("src_mac_check", jsonutils.JSONFalse)
_, err := mcclient_modules.Servers.PerformAction(sess, guest.Id, "modify-src-check", params)
if err != nil {
return errors.Wrapf(err, "turn off src check of guest %s(%s)", guest.Name, guest.Id)
}
}
}
return nil
}
pkg/mcclient/options/loadbalanceragents.go
+1 -1
View File
@@ -150,7 +150,7 @@ type LoadbalancerAgentActionDeployOptions struct {
ID string `json:"-"`
Host string `help:"name or id of the server in format '<[server:]id|host:id>|ipaddr var=val'" json:"-"`
DeployMethod string `help:"use yum repo or use file copy" choices:"yum|copy" default:"copy"`
DeployMethod string `help:"use yum repo or use file copy" choices:"yum|copy" default:"yum"`
}
func (opts *LoadbalancerAgentActionDeployOptions) Params() (*jsonutils.JSONDict, error) {