From 9226ccbcd137f880700ba0a045a8bf0ab2a4d08d Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 4 Jul 2019 16:17:53 +0200 Subject: [PATCH] run make update Signed-off-by: Thomas Lamprecht --- api-viewer/apidata.js | 64 ++++++++++++++++++++++++++++++++++++----- pvecm.1-synopsis.adoc | 20 +++++++++++++ vzdump.1-synopsis.adoc | 4 +++ vzdump.conf.5-opts.adoc | 4 +++ 4 files changed, 85 insertions(+), 7 deletions(-) diff --git a/api-viewer/apidata.js b/api-viewer/apidata.js index bfdc1ca..befa589 100644 --- a/api-viewer/apidata.js +++ b/api-viewer/apidata.js @@ -636,6 +636,33 @@ var pveapi = [ "leaf" : 1, "path" : "/cluster/config/totem", "text" : "totem" + }, + { + "info" : { + "GET" : { + "description" : "Get QDevice status", + "method" : "GET", + "name" : "status", + "parameters" : { + "additionalProperties" : 0 + }, + "permissions" : { + "check" : [ + "perm", + "/", + [ + "Sys.Audit" + ] + ] + }, + "returns" : { + "type" : "object" + } + } + }, + "leaf" : 1, + "path" : "/cluster/config/qdevice", + "text" : "qdevice" } ], "info" : { @@ -2983,6 +3010,12 @@ var pveapi = [ "type" : "integer", "typetext" : "" }, + "pool" : { + "description" : "Backup all known guest systems included in the specified pool.", + "optional" : 1, + "type" : "string", + "typetext" : "" + }, "quiet" : { "default" : 0, "description" : "Be quiet.", @@ -3252,6 +3285,12 @@ var pveapi = [ "type" : "integer", "typetext" : "" }, + "pool" : { + "description" : "Backup all known guest systems included in the specified pool.", + "optional" : 1, + "type" : "string", + "typetext" : "" + }, "quiet" : { "default" : 0, "description" : "Be quiet.", @@ -16405,7 +16444,7 @@ var pveapi = [ "returns" : { "properties" : { "allowed_nodes" : { - "description" : "List nodes allowed for offline migration with same local storage as source node, only passed if VM is offline", + "description" : "List nodes allowed for offline migration, only passed if VM is offline", "optional" : 1, "type" : "array" }, @@ -16417,6 +16456,11 @@ var pveapi = [ "description" : "List local resources e.g. pci, usb", "type" : "array" }, + "not_allowed_nodes" : { + "description" : "List not allowed nodes with additional informations, only passed if VM is offline", + "optional" : 1, + "type" : "object" + }, "running" : { "type" : "boolean" } @@ -27244,6 +27288,12 @@ var pveapi = [ "type" : "integer", "typetext" : "" }, + "pool" : { + "description" : "Backup all known guest systems included in the specified pool.", + "optional" : 1, + "type" : "string", + "typetext" : "" + }, "quiet" : { "default" : 0, "description" : "Be quiet.", @@ -33657,9 +33707,9 @@ var pveapi = [ "default" : "login", "description" : "Run specific command or default to login.", "enum" : [ - "ceph_install", "upgrade", - "login" + "login", + "ceph_install" ], "optional" : 1, "type" : "string" @@ -33751,9 +33801,9 @@ var pveapi = [ "default" : "login", "description" : "Run specific command or default to login.", "enum" : [ - "ceph_install", "upgrade", - "login" + "login", + "ceph_install" ], "optional" : 1, "type" : "string" @@ -33874,9 +33924,9 @@ var pveapi = [ "default" : "login", "description" : "Run specific command or default to login.", "enum" : [ - "ceph_install", "upgrade", - "login" + "login", + "ceph_install" ], "optional" : 1, "type" : "string" diff --git a/pvecm.1-synopsis.adoc b/pvecm.1-synopsis.adoc index adb92f6..daa6163 100644 --- a/pvecm.1-synopsis.adoc +++ b/pvecm.1-synopsis.adoc @@ -112,6 +112,26 @@ Generate new cryptographic key for corosync. Output file name +*pvecm mtunnel* `[]` `[OPTIONS]` + +Used by VM/CT migration - do not use manually. + +``: `` :: + +Extra arguments as array + +`--get_migration_ip` `` ('default =' `0`):: + +return the migration IP, if configured + +`--migration_network` `` :: + +the migration network used to detect the local migration IP + +`--run-command` `` :: + +Run a command with a tcp socket as standard input. The IP address and port are printed via this command's stdandard output first, each on a separate line. + *pvecm nodes* Displays the local view of the cluster nodes. diff --git a/vzdump.1-synopsis.adoc b/vzdump.1-synopsis.adoc index 7a6ce7e..7f14983 100644 --- a/vzdump.1-synopsis.adoc +++ b/vzdump.1-synopsis.adoc @@ -64,6 +64,10 @@ Only run if executed on this node. Use pigz instead of gzip when N>0. N=1 uses half of cores, N>1 uses N as thread count. +`--pool` `` :: + +Backup all known guest systems included in the specified pool. + `--quiet` `` ('default =' `0`):: Be quiet. diff --git a/vzdump.conf.5-opts.adoc b/vzdump.conf.5-opts.adoc index 6bf8615..b2f7d0c 100644 --- a/vzdump.conf.5-opts.adoc +++ b/vzdump.conf.5-opts.adoc @@ -42,6 +42,10 @@ Backup mode. Use pigz instead of gzip when N>0. N=1 uses half of cores, N>1 uses N as thread count. +`pool`: `` :: + +Backup all known guest systems included in the specified pool. + `remove`: `` ('default =' `1`):: Remove old backup files if there are more than 'maxfiles' backup files. -- 2.39.2