opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.1.0 -> release/2.2.0

Browse Source 
* commit 'f831c8daea5797745a6f5b2f8c60510b690932ff':
  climc: server deploy and save-image auto_start
This commit is contained in:
邱剑
2018-09-12 14:07:07 +08:00
parent 3b6b0c3795 f831c8daea
commit c8f441cbb1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/options/servers.go
+7 -5
View File
@@ -210,6 +210,7 @@ type ServerDeployOptions struct {
Deploy []string `help:"Specify deploy files in virtual server file system" json:"-"`
ResetPassword *bool `help:"Force reset password"`
Password string `help:"Default user password"`
AutoStart *bool `help:"Auto start server after deployed"`
}
func (opts *ServerDeployOptions) Params() (*jsonutils.JSONDict, error) {
@@ -252,11 +253,12 @@ type ServerMonitorOptions struct {
}
type ServerSaveImageOptions struct {
ID string `help:"ID or name of server" json:"-"`
IMAGE string `help:"Image name" json:"name"`
Public *bool `help:"Make the image public available" json:"is_public"`
Format string `help:"image format" choices:"vmdk|qcow2"`
Notes string `help:"Notes about the image"`
ID string `help:"ID or name of server" json:"-"`
IMAGE string `help:"Image name" json:"name"`
Public *bool `help:"Make the image public available" json:"is_public"`
Format string `help:"image format" choices:"vmdk|qcow2"`
Notes string `help:"Notes about the image"`
AutoStart *bool `help:"Auto start server after image saved"`
}
type ServerRebuildRootOptions struct {