Merge pull request #1305 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-create-input-keypair-secgrp to release/2.8.0

* commit '6147f7d7d1dc1f246d139c1990447774d479f8a3':
  fix: climc server-create input keypair missing

pkg/apis/compute/api.go

@@ -169,6 +169,7 @@ type ServerDeployInput struct {
 
 	Id string
 
+	Keypair       string          `json:"keypair"`
 	DeleteKeypair bool            `json:"__delete_keypair__"`
 	DeployConfigs []*DeployConfig `json:"deploy_configs"`
 	ResetPassword *bool           `json:"reset_password"`

pkg/mcclient/options/servers.go

@@ -285,7 +285,7 @@ func (opts *ServerCreateOptions) Params() (*computeapi.ServerCreateInput, error)
 	params := &computeapi.ServerCreateInput{
 		ServerConfigs:      config,
 		VcpuCount:          opts.VcpuCount,
-		Keypair:            opts.Keypair,
+		KeypairId:          opts.Keypair,
 		Password:           opts.Password,
 		Cdrom:              opts.Iso,
 		Vga:                opts.Vga,