update generated docs

diff --git a/api-viewer/apidata.js b/api-viewer/apidata.js
index a8916dd57e78d8fd92244d3027108505b4e58956..a6b3ccae3c20266aed7437f6573536653ef2055f 100644 (file)
--- a/api-viewer/apidata.js
+++ b/api-viewer/apidata.js
@@ -2953,11 +2953,12 @@ var pveapi = [
                                           "started",
                                           "stopped",
                                           "enabled",
                                           "started",
                                           "stopped",
                                           "enabled",

-                                          "disabled"
+                                          "disabled",
+                                          "ignored"

                                        ],
                                        "optional" : 1,
                                        "type" : "string",
                                        ],
                                        "optional" : 1,
                                        "type" : "string",

-                                       "verbose_description" : "Requested resource state. The CRM reads this state and acts accordingly.\nPlease note that `enabled` is just an alias for `started`.\n\n`started`;;\n\nThe CRM tries to start the resource. Service state is\nset to `started` after successful start. On node failures, or when start\nfails, it tries to recover the resource.  If everything fails, service\nstate it set to `error`.\n\n`stopped`;;\n\nThe CRM tries to keep the resource in `stopped` state, but it\nstill tries to relocate the resources on node failures.\n\n`disabled`;;\n\nThe CRM tries to put the resource in `stopped` state, but does not try\nto relocate the resources on node failures. The main purpose of this\nstate is error recovery, because it is the only way to move a resource out\nof the `error` state.\n\n"
+                                       "verbose_description" : "Requested resource state. The CRM reads this state and acts accordingly.\nPlease note that `enabled` is just an alias for `started`.\n\n`started`;;\n\nThe CRM tries to start the resource. Service state is\nset to `started` after successful start. On node failures, or when start\nfails, it tries to recover the resource.  If everything fails, service\nstate it set to `error`.\n\n`stopped`;;\n\nThe CRM tries to keep the resource in `stopped` state, but it\nstill tries to relocate the resources on node failures.\n\n`disabled`;;\n\nThe CRM tries to put the resource in `stopped` state, but does not try\nto relocate the resources on node failures. The main purpose of this\nstate is error recovery, because it is the only way to move a resource out\nof the `error` state.\n\n`ignored`;;\n\nThe resource gets removed from the manager status and so the CRM and the LRM do\nnot touch the resource anymore. All {pve} API calls affecting this resource\nwill be executed, directly bypassing the HA stack. CRM commands will be thrown\naway while there source is in this state. The resource will not get relocated\non node failures.\n\n"

                                     }
                                  },
                                  "type" : "object"
                                     }
                                  },
                                  "type" : "object"


@@ -3078,11 +3079,12 @@ var pveapi = [
                                     "started",
                                     "stopped",
                                     "enabled",
                                     "started",
                                     "stopped",
                                     "enabled",

-                                    "disabled"
+                                    "disabled",
+                                    "ignored"

                                  ],
                                  "optional" : 1,
                                  "type" : "string",
                                  ],
                                  "optional" : 1,
                                  "type" : "string",

-                                 "verbose_description" : "Requested resource state. The CRM reads this state and acts accordingly.\nPlease note that `enabled` is just an alias for `started`.\n\n`started`;;\n\nThe CRM tries to start the resource. Service state is\nset to `started` after successful start. On node failures, or when start\nfails, it tries to recover the resource.  If everything fails, service\nstate it set to `error`.\n\n`stopped`;;\n\nThe CRM tries to keep the resource in `stopped` state, but it\nstill tries to relocate the resources on node failures.\n\n`disabled`;;\n\nThe CRM tries to put the resource in `stopped` state, but does not try\nto relocate the resources on node failures. The main purpose of this\nstate is error recovery, because it is the only way to move a resource out\nof the `error` state.\n\n"
+                                 "verbose_description" : "Requested resource state. The CRM reads this state and acts accordingly.\nPlease note that `enabled` is just an alias for `started`.\n\n`started`;;\n\nThe CRM tries to start the resource. Service state is\nset to `started` after successful start. On node failures, or when start\nfails, it tries to recover the resource.  If everything fails, service\nstate it set to `error`.\n\n`stopped`;;\n\nThe CRM tries to keep the resource in `stopped` state, but it\nstill tries to relocate the resources on node failures.\n\n`disabled`;;\n\nThe CRM tries to put the resource in `stopped` state, but does not try\nto relocate the resources on node failures. The main purpose of this\nstate is error recovery, because it is the only way to move a resource out\nof the `error` state.\n\n`ignored`;;\n\nThe resource gets removed from the manager status and so the CRM and the LRM do\nnot touch the resource anymore. All {pve} API calls affecting this resource\nwill be executed, directly bypassing the HA stack. CRM commands will be thrown\naway while there source is in this state. The resource will not get relocated\non node failures.\n\n"

                               },
                               "type" : {
                                  "description" : "Resource type.",
                               },
                               "type" : {
                                  "description" : "Resource type.",


@@ -5904,12 +5906,12 @@ var pveapi = [
                                           "cpuunits" : {
                                              "default" : 1024,
                                              "description" : "CPU weight for a VM.",
                                           "cpuunits" : {
                                              "default" : 1024,
                                              "description" : "CPU weight for a VM.",

-                                             "maximum" : 500000,
-                                             "minimum" : 0,
+                                             "maximum" : 262144,
+                                             "minimum" : 2,

                                              "optional" : 1,
                                              "type" : "integer",
                                              "optional" : 1,
                                              "type" : "integer",

-                                             "typetext" : "<integer> (0 - 500000)",
-                                             "verbose_description" : "CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to weights of all the other running VMs.\n\nNOTE: You can disable fair-scheduler configuration by setting this to 0."
+                                             "typetext" : "<integer> (2 - 262144)",
+                                             "verbose_description" : "CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to weights of all the other running VMs."

                                           },
                                           "delete" : {
                                              "description" : "A list of settings you want to delete.",
                                           },
                                           "delete" : {
                                              "description" : "A list of settings you want to delete.",


@@ -7680,6 +7682,13 @@ var pveapi = [
                                              "type" : "integer",
                                              "typetext" : "<integer> (1 - N)"
                                           },
                                              "type" : "integer",
                                              "typetext" : "<integer> (1 - N)"
                                           },

+                                          "vmstatestorage" : {
+                                             "description" : "Default storage for VM state volumes/files.",
+                                             "format" : "pve-storage-id",
+                                             "optional" : 1,
+                                             "type" : "string",
+                                             "typetext" : "<string>"
+                                          },

                                           "watchdog" : {
                                              "description" : "Create a virtual hardware watchdog device.",
                                              "format" : "pve-qm-watchdog",
                                           "watchdog" : {
                                              "description" : "Create a virtual hardware watchdog device.",
                                              "format" : "pve-qm-watchdog",


@@ -7859,12 +7868,12 @@ var pveapi = [
                                           "cpuunits" : {
                                              "default" : 1024,
                                              "description" : "CPU weight for a VM.",
                                           "cpuunits" : {
                                              "default" : 1024,
                                              "description" : "CPU weight for a VM.",

-                                             "maximum" : 500000,
-                                             "minimum" : 0,
+                                             "maximum" : 262144,
+                                             "minimum" : 2,

                                              "optional" : 1,
                                              "type" : "integer",
                                              "optional" : 1,
                                              "type" : "integer",

-                                             "typetext" : "<integer> (0 - 500000)",
-                                             "verbose_description" : "CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to weights of all the other running VMs.\n\nNOTE: You can disable fair-scheduler configuration by setting this to 0."
+                                             "typetext" : "<integer> (2 - 262144)",
+                                             "verbose_description" : "CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to weights of all the other running VMs."

                                           },
                                           "delete" : {
                                              "description" : "A list of settings you want to delete.",
                                           },
                                           "delete" : {
                                              "description" : "A list of settings you want to delete.",


@@ -9635,6 +9644,13 @@ var pveapi = [
                                              "type" : "integer",
                                              "typetext" : "<integer> (1 - N)"
                                           },
                                              "type" : "integer",
                                              "typetext" : "<integer> (1 - N)"
                                           },

+                                          "vmstatestorage" : {
+                                             "description" : "Default storage for VM state volumes/files.",
+                                             "format" : "pve-storage-id",
+                                             "optional" : 1,
+                                             "type" : "string",
+                                             "typetext" : "<string>"
+                                          },

                                           "watchdog" : {
                                              "description" : "Create a virtual hardware watchdog device.",
                                              "format" : "pve-qm-watchdog",
                                           "watchdog" : {
                                              "description" : "Create a virtual hardware watchdog device.",
                                              "format" : "pve-qm-watchdog",


@@ -11234,8 +11250,11 @@ var pveapi = [
                                                       "perm",
                                                       "/vms/{vmid}",
                                                       [
                                                       "perm",
                                                       "/vms/{vmid}",
                                                       [

-                                                         "VM.Snapshot"
-                                                      ]
+                                                         "VM.Snapshot",
+                                                         "VM.Snapshot.Rollback"
+                                                      ],
+                                                      "any",
+                                                      1

                                                    ]
                                                 },
                                                 "proxyto" : "node",
                                                    ]
                                                 },
                                                 "proxyto" : "node",


@@ -11334,8 +11353,11 @@ var pveapi = [
                                                       "perm",
                                                       "/vms/{vmid}",
                                                       [
                                                       "perm",
                                                       "/vms/{vmid}",
                                                       [

-                                                         "VM.Snapshot"
-                                                      ]
+                                                         "VM.Snapshot",
+                                                         "VM.Snapshot.Rollback"
+                                                      ],
+                                                      "any",
+                                                      1

                                                    ]
                                                 },
                                                 "protected" : 1,
                                                    ]
                                                 },
                                                 "protected" : 1,


@@ -11947,12 +11969,12 @@ var pveapi = [
                               "cpuunits" : {
                                  "default" : 1024,
                                  "description" : "CPU weight for a VM.",
                               "cpuunits" : {
                                  "default" : 1024,
                                  "description" : "CPU weight for a VM.",

-                                 "maximum" : 500000,
-                                 "minimum" : 0,
+                                 "maximum" : 262144,
+                                 "minimum" : 2,

                                  "optional" : 1,
                                  "type" : "integer",
                                  "optional" : 1,
                                  "type" : "integer",

-                                 "typetext" : "<integer> (0 - 500000)",
-                                 "verbose_description" : "CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to weights of all the other running VMs.\n\nNOTE: You can disable fair-scheduler configuration by setting this to 0."
+                                 "typetext" : "<integer> (2 - 262144)",
+                                 "verbose_description" : "CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to weights of all the other running VMs."

                               },
                               "description" : {
                                  "description" : "Description for the VM. Only used on the configuration web interface. This is saved as comment inside the configuration file.",
                               },
                               "description" : {
                                  "description" : "Description for the VM. Only used on the configuration web interface. This is saved as comment inside the configuration file.",


@@ -13717,6 +13739,13 @@ var pveapi = [
                                  "type" : "integer",
                                  "typetext" : "<integer> (1 - N)"
                               },
                                  "type" : "integer",
                                  "typetext" : "<integer> (1 - N)"
                               },

+                              "vmstatestorage" : {
+                                 "description" : "Default storage for VM state volumes/files.",
+                                 "format" : "pve-storage-id",
+                                 "optional" : 1,
+                                 "type" : "string",
+                                 "typetext" : "<string>"
+                              },

                               "watchdog" : {
                                  "description" : "Create a virtual hardware watchdog device.",
                                  "format" : "pve-qm-watchdog",
                               "watchdog" : {
                                  "description" : "Create a virtual hardware watchdog device.",
                                  "format" : "pve-qm-watchdog",


@@ -14007,14 +14036,14 @@ var pveapi = [
                                                 "ip" : {
                                                    "description" : "IPv4 address in CIDR format.",
                                                    "format" : "pve-ipv4-config",
                                                 "ip" : {
                                                    "description" : "IPv4 address in CIDR format.",
                                                    "format" : "pve-ipv4-config",

-                                                   "format_description" : "IPv4Format/CIDR",
+                                                   "format_description" : "(IPv4/CIDR|dhcp|manual)",

                                                    "optional" : 1,
                                                    "type" : "string"
                                                 },
                                                 "ip6" : {
                                                    "description" : "IPv6 address in CIDR format.",
                                                    "format" : "pve-ipv6-config",
                                                    "optional" : 1,
                                                    "type" : "string"
                                                 },
                                                 "ip6" : {
                                                    "description" : "IPv6 address in CIDR format.",
                                                    "format" : "pve-ipv6-config",

-                                                   "format_description" : "IPv6Format/CIDR",
+                                                   "format_description" : "(IPv6/CIDR|auto|dhcp|manual)",

                                                    "optional" : 1,
                                                    "type" : "string"
                                                 },
                                                    "optional" : 1,
                                                    "type" : "string"
                                                 },


@@ -14061,7 +14090,7 @@ var pveapi = [
                                              },
                                              "optional" : 1,
                                              "type" : "string",
                                              },
                                              "optional" : 1,
                                              "type" : "string",

-                                             "typetext" : "name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<IPv4Format/CIDR>] [,ip6=<IPv6Format/CIDR>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]"
+                                             "typetext" : "name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<(IPv4/CIDR|dhcp|manual)>] [,ip6=<(IPv6/CIDR|auto|dhcp|manual)>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]"

                                           },
                                           "node" : {
                                              "description" : "The cluster node name.",
                                           },
                                           "node" : {
                                              "description" : "The cluster node name.",


@@ -14621,8 +14650,11 @@ var pveapi = [
                                                       "perm",
                                                       "/vms/{vmid}",
                                                       [
                                                       "perm",
                                                       "/vms/{vmid}",
                                                       [

-                                                         "VM.Snapshot"
-                                                      ]
+                                                         "VM.Snapshot",
+                                                         "VM.Snapshot.Rollback"
+                                                      ],
+                                                      "any",
+                                                      1

                                                    ]
                                                 },
                                                 "protected" : 1,
                                                    ]
                                                 },
                                                 "protected" : 1,


@@ -14673,8 +14705,11 @@ var pveapi = [
                                                       "perm",
                                                       "/vms/{vmid}",
                                                       [
                                                       "perm",
                                                       "/vms/{vmid}",
                                                       [

-                                                         "VM.Snapshot"
-                                                      ]
+                                                         "VM.Snapshot",
+                                                         "VM.Snapshot.Rollback"
+                                                      ],
+                                                      "any",
+                                                      1

                                                    ]
                                                 },
                                                 "proxyto" : "node",
                                                    ]
                                                 },
                                                 "proxyto" : "node",


@@ -17714,14 +17749,14 @@ var pveapi = [
                                     "ip" : {
                                        "description" : "IPv4 address in CIDR format.",
                                        "format" : "pve-ipv4-config",
                                     "ip" : {
                                        "description" : "IPv4 address in CIDR format.",
                                        "format" : "pve-ipv4-config",

-                                       "format_description" : "IPv4Format/CIDR",
+                                       "format_description" : "(IPv4/CIDR|dhcp|manual)",

                                        "optional" : 1,
                                        "type" : "string"
                                     },
                                     "ip6" : {
                                        "description" : "IPv6 address in CIDR format.",
                                        "format" : "pve-ipv6-config",
                                        "optional" : 1,
                                        "type" : "string"
                                     },
                                     "ip6" : {
                                        "description" : "IPv6 address in CIDR format.",
                                        "format" : "pve-ipv6-config",

-                                       "format_description" : "IPv6Format/CIDR",
+                                       "format_description" : "(IPv6/CIDR|auto|dhcp|manual)",

                                        "optional" : 1,
                                        "type" : "string"
                                     },
                                        "optional" : 1,
                                        "type" : "string"
                                     },


@@ -17768,7 +17803,7 @@ var pveapi = [
                                  },
                                  "optional" : 1,
                                  "type" : "string",
                                  },
                                  "optional" : 1,
                                  "type" : "string",

-                                 "typetext" : "name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<IPv4Format/CIDR>] [,ip6=<IPv6Format/CIDR>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]"
+                                 "typetext" : "name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<(IPv4/CIDR|dhcp|manual)>] [,ip6=<(IPv6/CIDR|auto|dhcp|manual)>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]"

                               },
                               "node" : {
                                  "description" : "The cluster node name.",
                               },
                               "node" : {
                                  "description" : "The cluster node name.",


@@ -18168,7 +18203,7 @@ var pveapi = [
                                        "type" : "string"
                                     },
                                     "journal_dev" : {
                                        "type" : "string"
                                     },
                                     "journal_dev" : {

-                                       "description" : "Block device name for journal.",
+                                       "description" : "Block device name for journal (filestore) or block.db (bluestore).",

                                        "optional" : 1,
                                        "type" : "string",
                                        "typetext" : "<string>"
                                        "optional" : 1,
                                        "type" : "string",
                                        "typetext" : "<string>"


@@ -18178,6 +18213,12 @@ var pveapi = [
                                        "format" : "pve-node",
                                        "type" : "string",
                                        "typetext" : "<string>"
                                        "format" : "pve-node",
                                        "type" : "string",
                                        "typetext" : "<string>"

+                                    },
+                                    "wal_dev" : {
+                                       "description" : "Block device name for block.wal (bluestore only).",
+                                       "optional" : 1,
+                                       "type" : "string",
+                                       "typetext" : "<string>"

                                     }
                                  }
                               },
                                     }
                                  }
                               },


@@ -18317,16 +18358,23 @@ var pveapi = [
                            {
                               "info" : {
                                  "DELETE" : {
                            {
                               "info" : {
                                  "DELETE" : {

-                                    "description" : "Destroy Ceph monitor.",
+                                    "description" : "Destroy Ceph Monitor and Manager.",

                                     "method" : "DELETE",
                                     "name" : "destroymon",
                                     "parameters" : {
                                        "additionalProperties" : 0,
                                        "properties" : {
                                     "method" : "DELETE",
                                     "name" : "destroymon",
                                     "parameters" : {
                                        "additionalProperties" : 0,
                                        "properties" : {

+                                          "exclude-manager" : {
+                                             "default" : 0,
+                                             "description" : "When set, removes only the monitor, not the manager",
+                                             "optional" : 1,
+                                             "type" : "boolean",
+                                             "typetext" : "<boolean>"
+                                          },

                                           "monid" : {
                                              "description" : "Monitor ID",
                                           "monid" : {
                                              "description" : "Monitor ID",

-                                             "type" : "integer",
-                                             "typetext" : "<integer>"
+                                             "pattern" : "[a-zA-Z0-9]([a-zA-Z0-9\\-]*[a-zA-Z0-9])?",
+                                             "type" : "string"

                                           },
                                           "node" : {
                                              "description" : "The cluster node name.",
                                           },
                                           "node" : {
                                              "description" : "The cluster node name.",


@@ -18409,12 +18457,25 @@ var pveapi = [
                               }
                            },
                            "POST" : {
                               }
                            },
                            "POST" : {

-                              "description" : "Create Ceph Monitor",
+                              "description" : "Create Ceph Monitor and Manager",

                               "method" : "POST",
                               "name" : "createmon",
                               "parameters" : {
                                  "additionalProperties" : 0,
                                  "properties" : {
                               "method" : "POST",
                               "name" : "createmon",
                               "parameters" : {
                                  "additionalProperties" : 0,
                                  "properties" : {

+                                    "exclude-manager" : {
+                                       "default" : 0,
+                                       "description" : "When set, only a monitor will be created.",
+                                       "optional" : 1,
+                                       "type" : "boolean",
+                                       "typetext" : "<boolean>"
+                                    },
+                                    "id" : {
+                                       "description" : "The ID for the monitor, when omitted the same as the nodename",
+                                       "optional" : 1,
+                                       "pattern" : "[a-zA-Z0-9]([a-zA-Z0-9\\-]*[a-zA-Z0-9])?",
+                                       "type" : "string"
+                                    },

                                     "node" : {
                                        "description" : "The cluster node name.",
                                        "format" : "pve-node",
                                     "node" : {
                                        "description" : "The cluster node name.",
                                        "format" : "pve-node",


@@ -18522,6 +18583,93 @@ var pveapi = [
                         "path" : "/nodes/{node}/ceph/init",
                         "text" : "init"
                      },
                         "path" : "/nodes/{node}/ceph/init",
                         "text" : "init"
                      },

+                     {
+                        "children" : [
+                           {
+                              "info" : {
+                                 "DELETE" : {
+                                    "description" : "Destroy Ceph Manager.",
+                                    "method" : "DELETE",
+                                    "name" : "destroymgr",
+                                    "parameters" : {
+                                       "additionalProperties" : 0,
+                                       "properties" : {
+                                          "id" : {
+                                             "description" : "The ID of the manager",
+                                             "pattern" : "[a-zA-Z0-9]([a-zA-Z0-9\\-]*[a-zA-Z0-9])?",
+                                             "type" : "string"
+                                          },
+                                          "node" : {
+                                             "description" : "The cluster node name.",
+                                             "format" : "pve-node",
+                                             "type" : "string",
+                                             "typetext" : "<string>"
+                                          }
+                                       }
+                                    },
+                                    "permissions" : {
+                                       "check" : [
+                                          "perm",
+                                          "/",
+                                          [
+                                             "Sys.Modify"
+                                          ]
+                                       ]
+                                    },
+                                    "protected" : 1,
+                                    "proxyto" : "node",
+                                    "returns" : {
+                                       "type" : "string"
+                                    }
+                                 }
+                              },
+                              "leaf" : 1,
+                              "path" : "/nodes/{node}/ceph/mgr/{id}",
+                              "text" : "{id}"
+                           }
+                        ],
+                        "info" : {
+                           "POST" : {
+                              "description" : "Create Ceph Manager",
+                              "method" : "POST",
+                              "name" : "createmgr",
+                              "parameters" : {
+                                 "additionalProperties" : 0,
+                                 "properties" : {
+                                    "id" : {
+                                       "description" : "The ID for the manager, when omitted the same as the nodename",
+                                       "optional" : 1,
+                                       "pattern" : "[a-zA-Z0-9]([a-zA-Z0-9\\-]*[a-zA-Z0-9])?",
+                                       "type" : "string"
+                                    },
+                                    "node" : {
+                                       "description" : "The cluster node name.",
+                                       "format" : "pve-node",
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    }
+                                 }
+                              },
+                              "permissions" : {
+                                 "check" : [
+                                    "perm",
+                                    "/",
+                                    [
+                                       "Sys.Modify"
+                                    ]
+                                 ]
+                              },
+                              "protected" : 1,
+                              "proxyto" : "node",
+                              "returns" : {
+                                 "type" : "string"
+                              }
+                           }
+                        },
+                        "leaf" : 0,
+                        "path" : "/nodes/{node}/ceph/mgr",
+                        "text" : "mgr"
+                     },

                      {
                         "info" : {
                            "POST" : {
                      {
                         "info" : {
                            "POST" : {


@@ -18540,7 +18688,7 @@ var pveapi = [
                                     "service" : {
                                        "description" : "Ceph service name.",
                                        "optional" : 1,
                                     "service" : {
                                        "description" : "Ceph service name.",
                                        "optional" : 1,

-                                       "pattern" : "(mon|mds|osd)\\.[A-Za-z0-9]{1,32}",
+                                       "pattern" : "(mon|mds|osd|mgr)\\.[A-Za-z0-9\\-]{1,32}",

                                        "type" : "string"
                                     }
                                  }
                                        "type" : "string"
                                     }
                                  }


@@ -18583,7 +18731,7 @@ var pveapi = [
                                     "service" : {
                                        "description" : "Ceph service name.",
                                        "optional" : 1,
                                     "service" : {
                                        "description" : "Ceph service name.",
                                        "optional" : 1,

-                                       "pattern" : "(mon|mds|osd)\\.[A-Za-z0-9]{1,32}",
+                                       "pattern" : "(mon|mds|osd|mgr)\\.[A-Za-z0-9\\-]{1,32}",

                                        "type" : "string"
                                     }
                                  }
                                        "type" : "string"
                                     }
                                  }


@@ -18676,6 +18824,13 @@ var pveapi = [
                                              "format" : "pve-node",
                                              "type" : "string",
                                              "typetext" : "<string>"
                                              "format" : "pve-node",
                                              "type" : "string",
                                              "typetext" : "<string>"

+                                          },
+                                          "remove_storages" : {
+                                             "default" : 0,
+                                             "description" : "Remove all pveceph-managed storages configured for this pool",
+                                             "optional" : 1,
+                                             "type" : "boolean",
+                                             "typetext" : "<boolean>"

                                           }
                                        }
                                     },
                                           }
                                        }
                                     },


@@ -18691,7 +18846,7 @@ var pveapi = [
                                     "protected" : 1,
                                     "proxyto" : "node",
                                     "returns" : {
                                     "protected" : 1,
                                     "proxyto" : "node",
                                     "returns" : {

-                                       "type" : "null"
+                                       "type" : "string"

                                     }
                                  }
                               },
                                     }
                                  }
                               },


@@ -18761,17 +18916,30 @@ var pveapi = [
                               "parameters" : {
                                  "additionalProperties" : 0,
                                  "properties" : {
                               "parameters" : {
                                  "additionalProperties" : 0,
                                  "properties" : {

-                                    "crush_ruleset" : {
-                                       "default" : 0,
-                                       "description" : "The ruleset to use for mapping object placement in the cluster.",
-                                       "maximum" : 32768,
-                                       "minimum" : 0,
+                                    "add_storages" : {
+                                       "description" : "Configure VM and CT storages using the new pool.",

                                        "optional" : 1,
                                        "optional" : 1,

-                                       "type" : "integer",
-                                       "typetext" : "<integer> (0 - 32768)"
+                                       "type" : "boolean",
+                                       "typetext" : "<boolean>"
+                                    },
+                                    "application" : {
+                                       "description" : "The application of the pool, 'rbd' by default.",
+                                       "enum" : [
+                                          "rbd",
+                                          "cephfs",
+                                          "rgw"
+                                       ],
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    },
+                                    "crush_rule" : {
+                                       "description" : "The rule to use for mapping object placement in the cluster.",
+                                       "optional" : 1,
+                                       "type" : "string",
+                                       "typetext" : "<string>"

                                     },
                                     "min_size" : {
                                     },
                                     "min_size" : {

-                                       "default" : 1,
+                                       "default" : 2,

                                        "description" : "Minimum number of replicas per object",
                                        "maximum" : 7,
                                        "minimum" : 1,
                                        "description" : "Minimum number of replicas per object",
                                        "maximum" : 7,
                                        "minimum" : 1,


@@ -18800,7 +18968,7 @@ var pveapi = [
                                        "typetext" : "<integer> (8 - 32768)"
                                     },
                                     "size" : {
                                        "typetext" : "<integer> (8 - 32768)"
                                     },
                                     "size" : {

-                                       "default" : 2,
+                                       "default" : 3,

                                        "description" : "Number of replicas per object",
                                        "maximum" : 7,
                                        "minimum" : 1,
                                        "description" : "Number of replicas per object",
                                        "maximum" : 7,
                                        "minimum" : 1,


@@ -18822,7 +18990,7 @@ var pveapi = [
                               "protected" : 1,
                               "proxyto" : "node",
                               "returns" : {
                               "protected" : 1,
                               "proxyto" : "node",
                               "returns" : {

-                                 "type" : "null"
+                                 "type" : "string"

                               }
                            }
                         },
                               }
                            }
                         },


@@ -19073,6 +19241,56 @@ var pveapi = [
                         "leaf" : 1,
                         "path" : "/nodes/{node}/ceph/log",
                         "text" : "log"
                         "leaf" : 1,
                         "path" : "/nodes/{node}/ceph/log",
                         "text" : "log"

+                     },
+                     {
+                        "info" : {
+                           "GET" : {
+                              "description" : "List ceph rules.",
+                              "method" : "GET",
+                              "name" : "rules",
+                              "parameters" : {
+                                 "additionalProperties" : 0,
+                                 "properties" : {
+                                    "node" : {
+                                       "description" : "The cluster node name.",
+                                       "format" : "pve-node",
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    }
+                                 }
+                              },
+                              "permissions" : {
+                                 "check" : [
+                                    "perm",
+                                    "/",
+                                    [
+                                       "Sys.Audit",
+                                       "Datastore.Audit"
+                                    ],
+                                    "any",
+                                    1
+                                 ]
+                              },
+                              "protected" : 1,
+                              "proxyto" : "node",
+                              "returns" : {
+                                 "items" : {
+                                    "properties" : {},
+                                    "type" : "object"
+                                 },
+                                 "links" : [
+                                    {
+                                       "href" : "{name}",
+                                       "rel" : "child"
+                                    }
+                                 ],
+                                 "type" : "array"
+                              }
+                           }
+                        },
+                        "leaf" : 1,
+                        "path" : "/nodes/{node}/ceph/rules",
+                        "text" : "rules"

                      }
                   ],
                   "info" : {
                      }
                   ],
                   "info" : {


@@ -19857,8 +20075,9 @@ var pveapi = [
                            "properties" : {
                               "key" : {
                                  "description" : "Proxmox VE subscription key",
                            "properties" : {
                               "key" : {
                                  "description" : "Proxmox VE subscription key",

-                                 "type" : "string",
-                                 "typetext" : "<string>"
+                                 "maxLength" : 32,
+                                 "pattern" : "pve([124])([cbsp])-[0-9a-f]{10}",
+                                 "type" : "string"

                               },
                               "node" : {
                                  "description" : "The cluster node name.",
                               },
                               "node" : {
                                  "description" : "The cluster node name.",


@@ -24572,10 +24791,10 @@ var pveapi = [
                         },
                         "is_mountpoint" : {
                            "default" : "no",
                         },
                         "is_mountpoint" : {
                            "default" : "no",

-                           "description" : "Assume the directory is an externally managed mountpoint. If nothing is mounted the storage will be considered offline.",
+                           "description" : "Assume the given path is an externally managed mountpoint and consider the storage offline if it is not mounted. Using a boolean (yes/no) value serves as a shortcut to using the target path in this field.",

                            "optional" : 1,
                            "optional" : 1,

-                           "type" : "boolean",
-                           "typetext" : "<boolean>"
+                           "type" : "string",
+                           "typetext" : "<string>"

                         },
                         "krbd" : {
                            "description" : "Access rbd through krbd kernel module.",
                         },
                         "krbd" : {
                            "description" : "Access rbd through krbd kernel module.",


@@ -24597,6 +24816,13 @@ var pveapi = [
                            "type" : "boolean",
                            "typetext" : "<boolean>"
                         },
                            "type" : "boolean",
                            "typetext" : "<boolean>"
                         },

+                        "monhost" : {
+                           "description" : "IP addresses of monitors (for external clusters).",
+                           "format" : "pve-storage-portal-dns-list",
+                           "optional" : 1,
+                           "type" : "string",
+                           "typetext" : "<string>"
+                        },

                         "nodes" : {
                            "description" : "List of cluster node names.",
                            "format" : "pve-node-list",
                         "nodes" : {
                            "description" : "List of cluster node names.",
                            "format" : "pve-node-list",


@@ -24840,10 +25066,10 @@ var pveapi = [
                   },
                   "is_mountpoint" : {
                      "default" : "no",
                   },
                   "is_mountpoint" : {
                      "default" : "no",

-                     "description" : "Assume the directory is an externally managed mountpoint. If nothing is mounted the storage will be considered offline.",
+                     "description" : "Assume the given path is an externally managed mountpoint and consider the storage offline if it is not mounted. Using a boolean (yes/no) value serves as a shortcut to using the target path in this field.",

                      "optional" : 1,
                      "optional" : 1,

-                     "type" : "boolean",
-                     "typetext" : "<boolean>"
+                     "type" : "string",
+                     "typetext" : "<string>"

                   },
                   "iscsiprovider" : {
                      "description" : "iscsi provider",
                   },
                   "iscsiprovider" : {
                      "description" : "iscsi provider",


@@ -24872,7 +25098,7 @@ var pveapi = [
                      "typetext" : "<boolean>"
                   },
                   "monhost" : {
                      "typetext" : "<boolean>"
                   },
                   "monhost" : {

-                     "description" : "Monitors daemon ips.",
+                     "description" : "IP addresses of monitors (for external clusters).",

                      "format" : "pve-storage-portal-dns-list",
                      "optional" : 1,
                      "type" : "string",
                      "format" : "pve-storage-portal-dns-list",
                      "optional" : 1,
                      "type" : "string",


@@ -25925,6 +26151,25 @@ var pveapi = [
                                  "pattern" : "\\w+=[^,]+(,\\s*\\w+=[^,]+)*",
                                  "type" : "string"
                               },
                                  "pattern" : "\\w+=[^,]+(,\\s*\\w+=[^,]+)*",
                                  "type" : "string"
                               },

+                              "capath" : {
+                                 "default" : "/etc/ssl/certs",
+                                 "description" : "Path to the CA certificate store",
+                                 "optional" : 1,
+                                 "type" : "string",
+                                 "typetext" : "<string>"
+                              },
+                              "cert" : {
+                                 "description" : "Path to the client certificate",
+                                 "optional" : 1,
+                                 "type" : "string",
+                                 "typetext" : "<string>"
+                              },
+                              "certkey" : {
+                                 "description" : "Path to the client certificate key",
+                                 "optional" : 1,
+                                 "type" : "string",
+                                 "typetext" : "<string>"
+                              },

                               "comment" : {
                                  "description" : "Description.",
                                  "maxLength" : 4096,
                               "comment" : {
                                  "description" : "Description.",
                                  "maxLength" : 4096,


@@ -26011,6 +26256,13 @@ var pveapi = [
                                  "optional" : 1,
                                  "pattern" : "\\S{2,}",
                                  "type" : "string"
                                  "optional" : 1,
                                  "pattern" : "\\S{2,}",
                                  "type" : "string"

+                              },
+                              "verify" : {
+                                 "default" : 0,
+                                 "description" : "Verify the server's SSL certificate",
+                                 "optional" : 1,
+                                 "type" : "boolean",
+                                 "typetext" : "<boolean>"

                               }
                            },
                            "type" : "object"
                               }
                            },
                            "type" : "object"


@@ -26100,6 +26352,25 @@ var pveapi = [
                            "pattern" : "\\w+=[^,]+(,\\s*\\w+=[^,]+)*",
                            "type" : "string"
                         },
                            "pattern" : "\\w+=[^,]+(,\\s*\\w+=[^,]+)*",
                            "type" : "string"
                         },

+                        "capath" : {
+                           "default" : "/etc/ssl/certs",
+                           "description" : "Path to the CA certificate store",
+                           "optional" : 1,
+                           "type" : "string",
+                           "typetext" : "<string>"
+                        },
+                        "cert" : {
+                           "description" : "Path to the client certificate",
+                           "optional" : 1,
+                           "type" : "string",
+                           "typetext" : "<string>"
+                        },
+                        "certkey" : {
+                           "description" : "Path to the client certificate key",
+                           "optional" : 1,
+                           "type" : "string",
+                           "typetext" : "<string>"
+                        },

                         "comment" : {
                            "description" : "Description.",
                            "maxLength" : 4096,
                         "comment" : {
                            "description" : "Description.",
                            "maxLength" : 4096,


@@ -26181,6 +26452,13 @@ var pveapi = [
                            "optional" : 1,
                            "pattern" : "\\S{2,}",
                            "type" : "string"
                            "optional" : 1,
                            "pattern" : "\\S{2,}",
                            "type" : "string"

+                        },
+                        "verify" : {
+                           "default" : 0,
+                           "description" : "Verify the server's SSL certificate",
+                           "optional" : 1,
+                           "type" : "boolean",
+                           "typetext" : "<boolean>"

                         }
                      },
                      "type" : "object"
                         }
                      },
                      "type" : "object"


@@ -26207,7 +26485,7 @@ var pveapi = [
          {
             "info" : {
                "GET" : {
          {
             "info" : {
                "GET" : {

-                  "description" : "Dummy. Useful for formaters which want to priovde a login page.",
+                  "description" : "Dummy. Useful for formatters which want to provide a login page.",

                   "method" : "GET",
                   "name" : "get_ticket",
                   "parameters" : {
                   "method" : "GET",
                   "name" : "get_ticket",
                   "parameters" : {

diff --git a/ha-manager.1-synopsis.adoc b/ha-manager.1-synopsis.adoc
index 1d4602722b5d6319afd31ff05d9a191339880f3b..7394c5d25303608fe44a94a6cee63e416b599366 100644 (file)
--- a/ha-manager.1-synopsis.adoc
+++ b/ha-manager.1-synopsis.adoc
@@ -8,27 +8,27 @@ Create a new HA resource.
 
 HA resource ID. This consists of a resource type followed by a resource specific name, separated with colon (example: vm:100 / ct:100). For virtual machines and containers, you can simply use the VM or CT id as a shortcut (example: 100).
 
 
 HA resource ID. This consists of a resource type followed by a resource specific name, separated with colon (example: vm:100 / ct:100). For virtual machines and containers, you can simply use the VM or CT id as a shortcut (example: 100).
 

-`-comment` `<string>` ::
+`--comment` `<string>` ::

 
 Description.
 
 
 Description.
 

-`-group` `<string>` ::
+`--group` `<string>` ::

 
 The HA group identifier.
 
 
 The HA group identifier.
 

-`-max_relocate` `<integer> (0 - N)` ('default =' `1`)::
+`--max_relocate` `<integer> (0 - N)` ('default =' `1`)::

 
 Maximal number of service relocate tries when a service failes to start.
 
 
 Maximal number of service relocate tries when a service failes to start.
 

-`-max_restart` `<integer> (0 - N)` ('default =' `1`)::
+`--max_restart` `<integer> (0 - N)` ('default =' `1`)::

 
 Maximal number of tries to restart the service on a node after its start failed.
 
 
 Maximal number of tries to restart the service on a node after its start failed.
 

-`-state` `<disabled | enabled | started | stopped>` ('default =' `started`)::
+`--state` `<disabled | enabled | ignored | started | stopped>` ('default =' `started`)::

 
 Requested resource state.
 
 
 Requested resource state.
 

-`-type` `<ct | vm>` ::
+`--type` `<ct | vm>` ::

 
 Resource type.
 
 
 Resource type.
 


@@ -38,14 +38,14 @@ Resource type.
 
 List HA resources.
 
 
 List HA resources.
 

-`-type` `<ct | vm>` ::
+`--type` `<ct | vm>` ::

 
 Only list resources of specific type
 
 
 
 
 
 Only list resources of specific type
 
 
 
 

-*ha-manager groupadd* `<group> -nodes <string>` `[OPTIONS]`
+*ha-manager groupadd* `<group> --nodes <string>` `[OPTIONS]`

 
 Create a new HA group.
 
 
 Create a new HA group.
 


@@ -53,23 +53,23 @@ Create a new HA group.
 
 The HA group identifier.
 
 
 The HA group identifier.
 

-`-comment` `<string>` ::
+`--comment` `<string>` ::

 
 Description.
 
 
 Description.
 

-`-nodes` `<node>[:<pri>]{,<node>[:<pri>]}*` ::
+`--nodes` `<node>[:<pri>]{,<node>[:<pri>]}*` ::

 
 List of cluster node names with optional priority.
 
 
 List of cluster node names with optional priority.
 

-`-nofailback` `<boolean>` ('default =' `0`)::
+`--nofailback` `<boolean>` ('default =' `0`)::

 
 The CRM tries to run services on the node with the highest priority. If a node with higher priority comes online, the CRM migrates the service to that node. Enabling nofailback prevents that behavior.
 
 
 The CRM tries to run services on the node with the highest priority. If a node with higher priority comes online, the CRM migrates the service to that node. Enabling nofailback prevents that behavior.
 

-`-restricted` `<boolean>` ('default =' `0`)::
+`--restricted` `<boolean>` ('default =' `0`)::

 
 Resources bound to restricted groups may only run on nodes defined by the group.
 
 
 Resources bound to restricted groups may only run on nodes defined by the group.
 

-`-type` `<group>` ::
+`--type` `<group>` ::

 
 Group type.
 
 
 Group type.
 


@@ -99,27 +99,27 @@ Update ha group configuration.
 
 The HA group identifier.
 
 
 The HA group identifier.
 

-`-comment` `<string>` ::
+`--comment` `<string>` ::

 
 Description.
 
 
 Description.
 

-`-delete` `<string>` ::
+`--delete` `<string>` ::

 
 A list of settings you want to delete.
 
 
 A list of settings you want to delete.
 

-`-digest` `<string>` ::
+`--digest` `<string>` ::

 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 
 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 

-`-nodes` `<node>[:<pri>]{,<node>[:<pri>]}*` ::
+`--nodes` `<node>[:<pri>]{,<node>[:<pri>]}*` ::

 
 List of cluster node names with optional priority.
 
 
 List of cluster node names with optional priority.
 

-`-nofailback` `<boolean>` ('default =' `0`)::
+`--nofailback` `<boolean>` ('default =' `0`)::

 
 The CRM tries to run services on the node with the highest priority. If a node with higher priority comes online, the CRM migrates the service to that node. Enabling nofailback prevents that behavior.
 
 
 The CRM tries to run services on the node with the highest priority. If a node with higher priority comes online, the CRM migrates the service to that node. Enabling nofailback prevents that behavior.
 

-`-restricted` `<boolean>` ('default =' `0`)::
+`--restricted` `<boolean>` ('default =' `0`)::

 
 Resources bound to restricted groups may only run on nodes defined by the group.
 
 
 Resources bound to restricted groups may only run on nodes defined by the group.
 


@@ -134,7 +134,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -188,31 +188,31 @@ Update resource configuration.
 
 HA resource ID. This consists of a resource type followed by a resource specific name, separated with colon (example: vm:100 / ct:100). For virtual machines and containers, you can simply use the VM or CT id as a shortcut (example: 100).
 
 
 HA resource ID. This consists of a resource type followed by a resource specific name, separated with colon (example: vm:100 / ct:100). For virtual machines and containers, you can simply use the VM or CT id as a shortcut (example: 100).
 

-`-comment` `<string>` ::
+`--comment` `<string>` ::

 
 Description.
 
 
 Description.
 

-`-delete` `<string>` ::
+`--delete` `<string>` ::

 
 A list of settings you want to delete.
 
 
 A list of settings you want to delete.
 

-`-digest` `<string>` ::
+`--digest` `<string>` ::

 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 
 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 

-`-group` `<string>` ::
+`--group` `<string>` ::

 
 The HA group identifier.
 
 
 The HA group identifier.
 

-`-max_relocate` `<integer> (0 - N)` ('default =' `1`)::
+`--max_relocate` `<integer> (0 - N)` ('default =' `1`)::

 
 Maximal number of service relocate tries when a service failes to start.
 
 
 Maximal number of service relocate tries when a service failes to start.
 

-`-max_restart` `<integer> (0 - N)` ('default =' `1`)::
+`--max_restart` `<integer> (0 - N)` ('default =' `1`)::

 
 Maximal number of tries to restart the service on a node after its start failed.
 
 
 Maximal number of tries to restart the service on a node after its start failed.
 

-`-state` `<disabled | enabled | started | stopped>` ('default =' `started`)::
+`--state` `<disabled | enabled | ignored | started | stopped>` ('default =' `started`)::

 
 Requested resource state.
 
 
 Requested resource state.
 


@@ -223,7 +223,7 @@ Requested resource state.
 
 Display HA manger status.
 
 
 Display HA manger status.
 

-`-verbose` `<boolean>` ('default =' `0`)::
+`--verbose` `<boolean>` ('default =' `0`)::

 
 Verbose output. Include complete CRM and LRM status (JSON).
 
 
 Verbose output. Include complete CRM and LRM status (JSON).
 

diff --git a/ha-resources-opts.adoc b/ha-resources-opts.adoc
index 3dcb6978a548b5b3445a9dffb6f8f063c4e980f5..c0aaf1999b881bb02c5392ad09e586457c4715c7 100644 (file)
--- a/ha-resources-opts.adoc
+++ b/ha-resources-opts.adoc
@@ -8,13 +8,13 @@ The HA group identifier.
 
 `max_relocate`: `<integer> (0 - N)` ('default =' `1`)::
 
 
 `max_relocate`: `<integer> (0 - N)` ('default =' `1`)::
 

-Maximal number of service relocate tries when a service fails to start.
+Maximal number of service relocate tries when a service failes to start.

 
 `max_restart`: `<integer> (0 - N)` ('default =' `1`)::
 
 Maximal number of tries to restart the service on a node after its start failed.
 
 
 `max_restart`: `<integer> (0 - N)` ('default =' `1`)::
 
 Maximal number of tries to restart the service on a node after its start failed.
 

-`state`: `<disabled | enabled | started | stopped>` ('default =' `started`)::
+`state`: `<disabled | enabled | ignored | started | stopped>` ('default =' `started`)::

 
 Requested resource state. The CRM reads this state and acts accordingly.
 Please note that `enabled` is just an alias for `started`.
 
 Requested resource state. The CRM reads this state and acts accordingly.
 Please note that `enabled` is just an alias for `started`.


@@ -37,4 +37,12 @@ The CRM tries to put the resource in `stopped` state, but does not try
 to relocate the resources on node failures. The main purpose of this
 state is error recovery, because it is the only way to move a resource out
 of the `error` state.
 to relocate the resources on node failures. The main purpose of this
 state is error recovery, because it is the only way to move a resource out
 of the `error` state.

++
+`ignored`;;
++
+The resource gets removed from the manager status and so the CRM and the LRM do
+not touch the resource anymore. All {pve} API calls affecting this resource
+will be executed, directly bypassing the HA stack. CRM commands will be thrown
+away while there source is in this state. The resource will not get relocated
+on node failures.

 
 

diff --git a/pct-network-opts.adoc b/pct-network-opts.adoc
index 50354da959f9159ac8c427ea7eab8f0c48895905..7943b0c485ee837494f75281b9f1f6aa5f438b15 100644 (file)
--- a/pct-network-opts.adoc
+++ b/pct-network-opts.adoc
@@ -1,4 +1,4 @@
-`net[n]`: `name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<IPv4Format/CIDR>] [,ip6=<IPv6Format/CIDR>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]` ::
+`net[n]`: `name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<(IPv4/CIDR|dhcp|manual)>] [,ip6=<(IPv6/CIDR|auto|dhcp|manual)>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]` ::

 
 Specifies network interfaces for the container.
 
 
 Specifies network interfaces for the container.
 


@@ -22,11 +22,11 @@ Default gateway for IPv6 traffic.
 
 The interface MAC address. This is dynamically allocated by default, but you can set that statically if needed, for example to always have the same link-local IPv6 address. (lxc.network.hwaddr)
 
 
 The interface MAC address. This is dynamically allocated by default, but you can set that statically if needed, for example to always have the same link-local IPv6 address. (lxc.network.hwaddr)
 

-`ip`=`<IPv4Format/CIDR>` ;;
+`ip`=`<(IPv4/CIDR|dhcp|manual)>` ;;

 
 IPv4 address in CIDR format.
 
 
 IPv4 address in CIDR format.
 

-`ip6`=`<IPv6Format/CIDR>` ;;
+`ip6`=`<(IPv6/CIDR|auto|dhcp|manual)>` ;;

 
 IPv6 address in CIDR format.
 
 
 IPv6 address in CIDR format.
 

diff --git a/pct.1-synopsis.adoc b/pct.1-synopsis.adoc
index 3e3f558a300ea0b6c3959639fb1ed738a80c6c44..0fea00326f57dd5d4e5fb8296ce8925dbf8922bf 100644 (file)
--- a/pct.1-synopsis.adoc
+++ b/pct.1-synopsis.adoc
@@ -1,6 +1,6 @@
 *pct* `<COMMAND> [ARGS] [OPTIONS]`
 
 *pct* `<COMMAND> [ARGS] [OPTIONS]`
 

-*pct clone* `<vmid> <newid> -experimental <boolean>` `[OPTIONS]`
+*pct clone* `<vmid> <newid> --experimental <boolean>` `[OPTIONS]`

 
 Create a container clone/copy
 
 
 Create a container clone/copy
 


@@ -12,31 +12,31 @@ The (unique) ID of the VM.
 
 VMID for the clone.
 
 
 VMID for the clone.
 

-`-description` `<string>` ::
+`--description` `<string>` ::

 
 Description for the new CT.
 
 
 Description for the new CT.
 

-`-experimental` `<boolean>` ('default =' `0`)::
+`--experimental` `<boolean>` ('default =' `0`)::

 
 The clone feature is experimental, set this flag if you know what you are doing.
 
 
 The clone feature is experimental, set this flag if you know what you are doing.
 

-`-full` `<boolean>` ('default =' `0`)::
+`--full` `<boolean>` ('default =' `0`)::

 
 Create a full copy of all disk. This is always done when you clone a normal CT. For CT templates, we try to create a linked clone by default.
 
 
 Create a full copy of all disk. This is always done when you clone a normal CT. For CT templates, we try to create a linked clone by default.
 

-`-hostname` `<string>` ::
+`--hostname` `<string>` ::

 
 Set a hostname for the new CT.
 
 
 Set a hostname for the new CT.
 

-`-pool` `<string>` ::
+`--pool` `<string>` ::

 
 Add the new CT to the specified pool.
 
 
 Add the new CT to the specified pool.
 

-`-snapname` `<string>` ::
+`--snapname` `<string>` ::

 
 The name of the snapshot.
 
 
 The name of the snapshot.
 

-`-storage` `<string>` ::
+`--storage` `<string>` ::

 
 Target storage for full clone.
 +
 
 Target storage for full clone.
 +


@@ -85,131 +85,131 @@ The (unique) ID of the VM.
 
 The OS template or backup file.
 
 
 The OS template or backup file.
 

-`-arch` `<amd64 | i386>` ('default =' `amd64`)::
+`--arch` `<amd64 | i386>` ('default =' `amd64`)::

 
 OS architecture type.
 
 
 OS architecture type.
 

-`-cmode` `<console | shell | tty>` ('default =' `tty`)::
+`--cmode` `<console | shell | tty>` ('default =' `tty`)::

 
 Console mode. By default, the console command tries to open a connection to one of the available tty devices. By setting cmode to 'console' it tries to attach to /dev/console instead. If you set cmode to 'shell', it simply invokes a shell inside the container (no login).
 
 
 Console mode. By default, the console command tries to open a connection to one of the available tty devices. By setting cmode to 'console' it tries to attach to /dev/console instead. If you set cmode to 'shell', it simply invokes a shell inside the container (no login).
 

-`-console` `<boolean>` ('default =' `1`)::
+`--console` `<boolean>` ('default =' `1`)::

 
 Attach a console device (/dev/console) to the container.
 
 
 Attach a console device (/dev/console) to the container.
 

-`-cores` `<integer> (1 - 128)` ::
+`--cores` `<integer> (1 - 128)` ::

 
 The number of cores assigned to the container. A container can use all available cores by default.
 
 
 The number of cores assigned to the container. A container can use all available cores by default.
 

-`-cpulimit` `<number> (0 - 128)` ('default =' `0`)::
+`--cpulimit` `<number> (0 - 128)` ('default =' `0`)::

 
 Limit of CPU usage.
 +
 NOTE: If the computer has 2 CPUs, it has a total of '2' CPU time. Value '0' indicates no CPU limit.
 
 
 Limit of CPU usage.
 +
 NOTE: If the computer has 2 CPUs, it has a total of '2' CPU time. Value '0' indicates no CPU limit.
 

-`-cpuunits` `<integer> (0 - 500000)` ('default =' `1024`)::
+`--cpuunits` `<integer> (0 - 500000)` ('default =' `1024`)::

 
 CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to the weights of all the other running VMs.
 +
 NOTE: You can disable fair-scheduler configuration by setting this to 0.
 
 
 CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to the weights of all the other running VMs.
 +
 NOTE: You can disable fair-scheduler configuration by setting this to 0.
 

-`-description` `<string>` ::
+`--description` `<string>` ::

 
 Container description. Only used on the configuration web interface.
 
 
 Container description. Only used on the configuration web interface.
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Allow to overwrite existing container.
 
 
 Allow to overwrite existing container.
 

-`-hostname` `<string>` ::
+`--hostname` `<string>` ::

 
 Set a host name for the container.
 
 
 Set a host name for the container.
 

-`-ignore-unpack-errors` `<boolean>` ::
+`--ignore-unpack-errors` `<boolean>` ::

 
 Ignore errors when extracting the template.
 
 
 Ignore errors when extracting the template.
 

-`-lock` `<backup | migrate | rollback | snapshot>` ::
+`--lock` `<backup | migrate | rollback | snapshot>` ::

 
 Lock/unlock the VM.
 
 
 Lock/unlock the VM.
 

-`-memory` `<integer> (16 - N)` ('default =' `512`)::
+`--memory` `<integer> (16 - N)` ('default =' `512`)::

 
 Amount of RAM for the VM in MB.
 
 
 Amount of RAM for the VM in MB.
 

-`-mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container mount point.
 
 
 Use volume as container mount point.
 

-`-nameserver` `<string>` ::
+`--nameserver` `<string>` ::

 
 Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 
 
 Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 

-`-net[n]` `name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<IPv4Format/CIDR>] [,ip6=<IPv6Format/CIDR>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]` ::
+`--net[n]` `name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<(IPv4/CIDR|dhcp|manual)>] [,ip6=<(IPv6/CIDR|auto|dhcp|manual)>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]` ::

 
 Specifies network interfaces for the container.
 
 
 Specifies network interfaces for the container.
 

-`-onboot` `<boolean>` ('default =' `0`)::
+`--onboot` `<boolean>` ('default =' `0`)::

 
 Specifies whether a VM will be started during system bootup.
 
 
 Specifies whether a VM will be started during system bootup.
 

-`-ostype` `<alpine | archlinux | centos | debian | fedora | gentoo | opensuse | ubuntu | unmanaged>` ::
+`--ostype` `<alpine | archlinux | centos | debian | fedora | gentoo | opensuse | ubuntu | unmanaged>` ::

 
 OS type. This is used to setup configuration inside the container, and corresponds to lxc setup scripts in /usr/share/lxc/config/<ostype>.common.conf. Value 'unmanaged' can be used to skip and OS specific setup.
 
 
 OS type. This is used to setup configuration inside the container, and corresponds to lxc setup scripts in /usr/share/lxc/config/<ostype>.common.conf. Value 'unmanaged' can be used to skip and OS specific setup.
 

-`-password` ::
+`--password` ::

 
 Sets root password inside container.
 
 
 Sets root password inside container.
 

-`-pool` `<string>` ::
+`--pool` `<string>` ::

 
 Add the VM to the specified pool.
 
 
 Add the VM to the specified pool.
 

-`-protection` `<boolean>` ('default =' `0`)::
+`--protection` `<boolean>` ('default =' `0`)::

 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 
 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 

-`-restore` `<boolean>` ::
+`--restore` `<boolean>` ::

 
 Mark this as restore task.
 
 
 Mark this as restore task.
 

-`-rootfs` `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--rootfs` `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container root.
 
 
 Use volume as container root.
 

-`-searchdomain` `<string>` ::
+`--searchdomain` `<string>` ::

 
 Sets DNS search domains for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 
 
 Sets DNS search domains for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 

-`-ssh-public-keys` `<string>` ::
+`--ssh-public-keys` `<filepath>` ::

 
 Setup public SSH keys (one key per line, OpenSSH format).
 
 
 Setup public SSH keys (one key per line, OpenSSH format).
 

-`-startup` `[[order=]\d+] [,up=\d+] [,down=\d+] ` ::
+`--startup` `[[order=]\d+] [,up=\d+] [,down=\d+] ` ::

 
 Startup and shutdown behavior. Order is a non-negative number defining the general startup order. Shutdown in done with reverse ordering. Additionally you can set the 'up' or 'down' delay in seconds, which specifies a delay to wait before the next VM is started or stopped.
 
 
 Startup and shutdown behavior. Order is a non-negative number defining the general startup order. Shutdown in done with reverse ordering. Additionally you can set the 'up' or 'down' delay in seconds, which specifies a delay to wait before the next VM is started or stopped.
 

-`-storage` `<string>` ('default =' `local`)::
+`--storage` `<string>` ('default =' `local`)::

 
 Default Storage.
 
 
 Default Storage.
 

-`-swap` `<integer> (0 - N)` ('default =' `512`)::
+`--swap` `<integer> (0 - N)` ('default =' `512`)::

 
 Amount of SWAP for the VM in MB.
 
 
 Amount of SWAP for the VM in MB.
 

-`-template` `<boolean>` ('default =' `0`)::
+`--template` `<boolean>` ('default =' `0`)::

 
 Enable/disable Template.
 
 
 Enable/disable Template.
 

-`-tty` `<integer> (0 - 6)` ('default =' `2`)::
+`--tty` `<integer> (0 - 6)` ('default =' `2`)::

 
 Specify the number of tty available to the container
 
 
 Specify the number of tty available to the container
 

-`-unprivileged` `<boolean>` ('default =' `0`)::
+`--unprivileged` `<boolean>` ('default =' `0`)::

 
 Makes the container run as unprivileged user. (Should not be modified manually.)
 
 
 Makes the container run as unprivileged user. (Should not be modified manually.)
 

-`-unused[n]` `<string>` ::
+`--unused[n]` `<string>` ::

 
 Reference to unused volumes. This is used internally, and should not be modified manually.
 
 
 Reference to unused volumes. This is used internally, and should not be modified manually.
 


@@ -228,7 +228,7 @@ The (unique) ID of the VM.
 
 The name of the snapshot.
 
 
 The name of the snapshot.
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 For removal from config file, even if removing disk snapshots fails.
 
 
 For removal from config file, even if removing disk snapshots fails.
 


@@ -288,11 +288,11 @@ Run a filesystem check (fsck) on a container volume.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-device` `<mp0 | mp1 | mp2 | mp3 | mp4 | mp5 | mp6 | mp7 | mp8 | mp9 | rootfs>` ::
+`--device` `<mp0 | mp1 | mp2 | mp3 | mp4 | mp5 | mp6 | mp7 | mp8 | mp9 | rootfs>` ::

 
 A volume on which to run the filesystem check
 
 
 A volume on which to run the filesystem check
 

-`-force` `<boolean>` ('default =' `0`)::
+`--force` `<boolean>` ('default =' `0`)::

 
 Force checking, even if the filesystem seems clean
 
 
 Force checking, even if the filesystem seems clean
 


@@ -307,7 +307,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -344,19 +344,19 @@ The (unique) ID of the VM.
 
 Target node.
 
 
 Target node.
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Force migration despite local bind / device mounts. NOTE: deprecated, use 'shared' property of mount point instead.
 
 
 Force migration despite local bind / device mounts. NOTE: deprecated, use 'shared' property of mount point instead.
 

-`-online` `<boolean>` ::
+`--online` `<boolean>` ::

 
 Use online/live migration.
 
 
 Use online/live migration.
 

-`-restart` `<boolean>` ::
+`--restart` `<boolean>` ::

 
 Use restart migration
 
 
 Use restart migration
 

-`-timeout` `<integer>` ('default =' `180`)::
+`--timeout` `<integer>` ('default =' `180`)::

 
 Timeout in seconds for shutdown for restart migration
 
 
 Timeout in seconds for shutdown for restart migration
 


@@ -391,15 +391,15 @@ Path to a file inside the container to pull.
 
 Destination
 
 
 Destination
 

-`-group` `<string>` ::
+`--group` `<string>` ::

 
 Owner group name or id.
 
 
 Owner group name or id.
 

-`-perms` `<string>` ::
+`--perms` `<string>` ::

 
 File permissions to use (octal by default, prefix with '0x' for hexadecimal).
 
 
 File permissions to use (octal by default, prefix with '0x' for hexadecimal).
 

-`-user` `<string>` ::
+`--user` `<string>` ::

 
 Owner user name or id.
 
 
 Owner user name or id.
 


@@ -421,15 +421,15 @@ Path to a local file.
 
 Destination inside the container to write to.
 
 
 Destination inside the container to write to.
 

-`-group` `<string>` ::
+`--group` `<string>` ::

 
 Owner group name or id. When using a name it must exist inside the container.
 
 
 Owner group name or id. When using a name it must exist inside the container.
 

-`-perms` `<string>` ::
+`--perms` `<string>` ::

 
 File permissions to use (octal by default, prefix with '0x' for hexadecimal).
 
 
 File permissions to use (octal by default, prefix with '0x' for hexadecimal).
 

-`-user` `<string>` ::
+`--user` `<string>` ::

 
 Owner user name or id. When using a name it must exist inside the container.
 
 
 Owner user name or id. When using a name it must exist inside the container.
 


@@ -452,7 +452,7 @@ The disk you want to resize.
 
 The new size. With the '+' sign the value is added to the actual size of the volume and without it, the value is taken as an absolute one. Shrinking disk size is not supported.
 
 
 The new size. With the '+' sign the value is added to the actual size of the volume and without it, the value is taken as an absolute one. Shrinking disk size is not supported.
 

-`-digest` `<string>` ::
+`--digest` `<string>` ::

 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 
 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 


@@ -470,127 +470,127 @@ The (unique) ID of the VM.
 
 The OS template or backup file.
 
 
 The OS template or backup file.
 

-`-arch` `<amd64 | i386>` ('default =' `amd64`)::
+`--arch` `<amd64 | i386>` ('default =' `amd64`)::

 
 OS architecture type.
 
 
 OS architecture type.
 

-`-cmode` `<console | shell | tty>` ('default =' `tty`)::
+`--cmode` `<console | shell | tty>` ('default =' `tty`)::

 
 Console mode. By default, the console command tries to open a connection to one of the available tty devices. By setting cmode to 'console' it tries to attach to /dev/console instead. If you set cmode to 'shell', it simply invokes a shell inside the container (no login).
 
 
 Console mode. By default, the console command tries to open a connection to one of the available tty devices. By setting cmode to 'console' it tries to attach to /dev/console instead. If you set cmode to 'shell', it simply invokes a shell inside the container (no login).
 

-`-console` `<boolean>` ('default =' `1`)::
+`--console` `<boolean>` ('default =' `1`)::

 
 Attach a console device (/dev/console) to the container.
 
 
 Attach a console device (/dev/console) to the container.
 

-`-cores` `<integer> (1 - 128)` ::
+`--cores` `<integer> (1 - 128)` ::

 
 The number of cores assigned to the container. A container can use all available cores by default.
 
 
 The number of cores assigned to the container. A container can use all available cores by default.
 

-`-cpulimit` `<number> (0 - 128)` ('default =' `0`)::
+`--cpulimit` `<number> (0 - 128)` ('default =' `0`)::

 
 Limit of CPU usage.
 +
 NOTE: If the computer has 2 CPUs, it has a total of '2' CPU time. Value '0' indicates no CPU limit.
 
 
 Limit of CPU usage.
 +
 NOTE: If the computer has 2 CPUs, it has a total of '2' CPU time. Value '0' indicates no CPU limit.
 

-`-cpuunits` `<integer> (0 - 500000)` ('default =' `1024`)::
+`--cpuunits` `<integer> (0 - 500000)` ('default =' `1024`)::

 
 CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to the weights of all the other running VMs.
 +
 NOTE: You can disable fair-scheduler configuration by setting this to 0.
 
 
 CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to the weights of all the other running VMs.
 +
 NOTE: You can disable fair-scheduler configuration by setting this to 0.
 

-`-description` `<string>` ::
+`--description` `<string>` ::

 
 Container description. Only used on the configuration web interface.
 
 
 Container description. Only used on the configuration web interface.
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Allow to overwrite existing container.
 
 
 Allow to overwrite existing container.
 

-`-hostname` `<string>` ::
+`--hostname` `<string>` ::

 
 Set a host name for the container.
 
 
 Set a host name for the container.
 

-`-ignore-unpack-errors` `<boolean>` ::
+`--ignore-unpack-errors` `<boolean>` ::

 
 Ignore errors when extracting the template.
 
 
 Ignore errors when extracting the template.
 

-`-lock` `<backup | migrate | rollback | snapshot>` ::
+`--lock` `<backup | migrate | rollback | snapshot>` ::

 
 Lock/unlock the VM.
 
 
 Lock/unlock the VM.
 

-`-memory` `<integer> (16 - N)` ('default =' `512`)::
+`--memory` `<integer> (16 - N)` ('default =' `512`)::

 
 Amount of RAM for the VM in MB.
 
 
 Amount of RAM for the VM in MB.
 

-`-mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container mount point.
 
 
 Use volume as container mount point.
 

-`-nameserver` `<string>` ::
+`--nameserver` `<string>` ::

 
 Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 
 
 Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 

-`-net[n]` `name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<IPv4Format/CIDR>] [,ip6=<IPv6Format/CIDR>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]` ::
+`--net[n]` `name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<(IPv4/CIDR|dhcp|manual)>] [,ip6=<(IPv6/CIDR|auto|dhcp|manual)>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]` ::

 
 Specifies network interfaces for the container.
 
 
 Specifies network interfaces for the container.
 

-`-onboot` `<boolean>` ('default =' `0`)::
+`--onboot` `<boolean>` ('default =' `0`)::

 
 Specifies whether a VM will be started during system bootup.
 
 
 Specifies whether a VM will be started during system bootup.
 

-`-ostype` `<alpine | archlinux | centos | debian | fedora | gentoo | opensuse | ubuntu | unmanaged>` ::
+`--ostype` `<alpine | archlinux | centos | debian | fedora | gentoo | opensuse | ubuntu | unmanaged>` ::

 
 OS type. This is used to setup configuration inside the container, and corresponds to lxc setup scripts in /usr/share/lxc/config/<ostype>.common.conf. Value 'unmanaged' can be used to skip and OS specific setup.
 
 
 OS type. This is used to setup configuration inside the container, and corresponds to lxc setup scripts in /usr/share/lxc/config/<ostype>.common.conf. Value 'unmanaged' can be used to skip and OS specific setup.
 

-`-password` ::
+`--password` ::

 
 Sets root password inside container.
 
 
 Sets root password inside container.
 

-`-pool` `<string>` ::
+`--pool` `<string>` ::

 
 Add the VM to the specified pool.
 
 
 Add the VM to the specified pool.
 

-`-protection` `<boolean>` ('default =' `0`)::
+`--protection` `<boolean>` ('default =' `0`)::

 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 
 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 

-`-rootfs` `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--rootfs` `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container root.
 
 
 Use volume as container root.
 

-`-searchdomain` `<string>` ::
+`--searchdomain` `<string>` ::

 
 Sets DNS search domains for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 
 
 Sets DNS search domains for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 

-`-ssh-public-keys` `<string>` ::
+`--ssh-public-keys` `<filepath>` ::

 
 Setup public SSH keys (one key per line, OpenSSH format).
 
 
 Setup public SSH keys (one key per line, OpenSSH format).
 

-`-startup` `[[order=]\d+] [,up=\d+] [,down=\d+] ` ::
+`--startup` `[[order=]\d+] [,up=\d+] [,down=\d+] ` ::

 
 Startup and shutdown behavior. Order is a non-negative number defining the general startup order. Shutdown in done with reverse ordering. Additionally you can set the 'up' or 'down' delay in seconds, which specifies a delay to wait before the next VM is started or stopped.
 
 
 Startup and shutdown behavior. Order is a non-negative number defining the general startup order. Shutdown in done with reverse ordering. Additionally you can set the 'up' or 'down' delay in seconds, which specifies a delay to wait before the next VM is started or stopped.
 

-`-storage` `<string>` ('default =' `local`)::
+`--storage` `<string>` ('default =' `local`)::

 
 Default Storage.
 
 
 Default Storage.
 

-`-swap` `<integer> (0 - N)` ('default =' `512`)::
+`--swap` `<integer> (0 - N)` ('default =' `512`)::

 
 Amount of SWAP for the VM in MB.
 
 
 Amount of SWAP for the VM in MB.
 

-`-template` `<boolean>` ('default =' `0`)::
+`--template` `<boolean>` ('default =' `0`)::

 
 Enable/disable Template.
 
 
 Enable/disable Template.
 

-`-tty` `<integer> (0 - 6)` ('default =' `2`)::
+`--tty` `<integer> (0 - 6)` ('default =' `2`)::

 
 Specify the number of tty available to the container
 
 
 Specify the number of tty available to the container
 

-`-unprivileged` `<boolean>` ('default =' `0`)::
+`--unprivileged` `<boolean>` ('default =' `0`)::

 
 Makes the container run as unprivileged user. (Should not be modified manually.)
 
 
 Makes the container run as unprivileged user. (Should not be modified manually.)
 

-`-unused[n]` `<string>` ::
+`--unused[n]` `<string>` ::

 
 Reference to unused volumes. This is used internally, and should not be modified manually.
 
 
 Reference to unused volumes. This is used internally, and should not be modified manually.
 


@@ -631,111 +631,111 @@ Set container options.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-arch` `<amd64 | i386>` ('default =' `amd64`)::
+`--arch` `<amd64 | i386>` ('default =' `amd64`)::

 
 OS architecture type.
 
 
 OS architecture type.
 

-`-cmode` `<console | shell | tty>` ('default =' `tty`)::
+`--cmode` `<console | shell | tty>` ('default =' `tty`)::

 
 Console mode. By default, the console command tries to open a connection to one of the available tty devices. By setting cmode to 'console' it tries to attach to /dev/console instead. If you set cmode to 'shell', it simply invokes a shell inside the container (no login).
 
 
 Console mode. By default, the console command tries to open a connection to one of the available tty devices. By setting cmode to 'console' it tries to attach to /dev/console instead. If you set cmode to 'shell', it simply invokes a shell inside the container (no login).
 

-`-console` `<boolean>` ('default =' `1`)::
+`--console` `<boolean>` ('default =' `1`)::

 
 Attach a console device (/dev/console) to the container.
 
 
 Attach a console device (/dev/console) to the container.
 

-`-cores` `<integer> (1 - 128)` ::
+`--cores` `<integer> (1 - 128)` ::

 
 The number of cores assigned to the container. A container can use all available cores by default.
 
 
 The number of cores assigned to the container. A container can use all available cores by default.
 

-`-cpulimit` `<number> (0 - 128)` ('default =' `0`)::
+`--cpulimit` `<number> (0 - 128)` ('default =' `0`)::

 
 Limit of CPU usage.
 +
 NOTE: If the computer has 2 CPUs, it has a total of '2' CPU time. Value '0' indicates no CPU limit.
 
 
 Limit of CPU usage.
 +
 NOTE: If the computer has 2 CPUs, it has a total of '2' CPU time. Value '0' indicates no CPU limit.
 

-`-cpuunits` `<integer> (0 - 500000)` ('default =' `1024`)::
+`--cpuunits` `<integer> (0 - 500000)` ('default =' `1024`)::

 
 CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to the weights of all the other running VMs.
 +
 NOTE: You can disable fair-scheduler configuration by setting this to 0.
 
 
 CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to the weights of all the other running VMs.
 +
 NOTE: You can disable fair-scheduler configuration by setting this to 0.
 

-`-delete` `<string>` ::
+`--delete` `<string>` ::

 
 A list of settings you want to delete.
 
 
 A list of settings you want to delete.
 

-`-description` `<string>` ::
+`--description` `<string>` ::

 
 Container description. Only used on the configuration web interface.
 
 
 Container description. Only used on the configuration web interface.
 

-`-digest` `<string>` ::
+`--digest` `<string>` ::

 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 
 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 

-`-hostname` `<string>` ::
+`--hostname` `<string>` ::

 
 Set a host name for the container.
 
 
 Set a host name for the container.
 

-`-lock` `<backup | migrate | rollback | snapshot>` ::
+`--lock` `<backup | migrate | rollback | snapshot>` ::

 
 Lock/unlock the VM.
 
 
 Lock/unlock the VM.
 

-`-memory` `<integer> (16 - N)` ('default =' `512`)::
+`--memory` `<integer> (16 - N)` ('default =' `512`)::

 
 Amount of RAM for the VM in MB.
 
 
 Amount of RAM for the VM in MB.
 

-`-mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--mp[n]` `[volume=]<volume> ,mp=<Path> [,acl=<1|0>] [,backup=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container mount point.
 
 
 Use volume as container mount point.
 

-`-nameserver` `<string>` ::
+`--nameserver` `<string>` ::

 
 Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 
 
 Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 

-`-net[n]` `name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<IPv4Format/CIDR>] [,ip6=<IPv6Format/CIDR>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]` ::
+`--net[n]` `name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<(IPv4/CIDR|dhcp|manual)>] [,ip6=<(IPv6/CIDR|auto|dhcp|manual)>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]` ::

 
 Specifies network interfaces for the container.
 
 
 Specifies network interfaces for the container.
 

-`-onboot` `<boolean>` ('default =' `0`)::
+`--onboot` `<boolean>` ('default =' `0`)::

 
 Specifies whether a VM will be started during system bootup.
 
 
 Specifies whether a VM will be started during system bootup.
 

-`-ostype` `<alpine | archlinux | centos | debian | fedora | gentoo | opensuse | ubuntu | unmanaged>` ::
+`--ostype` `<alpine | archlinux | centos | debian | fedora | gentoo | opensuse | ubuntu | unmanaged>` ::

 
 OS type. This is used to setup configuration inside the container, and corresponds to lxc setup scripts in /usr/share/lxc/config/<ostype>.common.conf. Value 'unmanaged' can be used to skip and OS specific setup.
 
 
 OS type. This is used to setup configuration inside the container, and corresponds to lxc setup scripts in /usr/share/lxc/config/<ostype>.common.conf. Value 'unmanaged' can be used to skip and OS specific setup.
 

-`-protection` `<boolean>` ('default =' `0`)::
+`--protection` `<boolean>` ('default =' `0`)::

 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 
 
 Sets the protection flag of the container. This will prevent the CT or CT's disk remove/update operation.
 

-`-rootfs` `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::
+`--rootfs` `[volume=]<volume> [,acl=<1|0>] [,quota=<1|0>] [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>]` ::

 
 Use volume as container root.
 
 
 Use volume as container root.
 

-`-searchdomain` `<string>` ::
+`--searchdomain` `<string>` ::

 
 Sets DNS search domains for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 
 
 Sets DNS search domains for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 

-`-startup` `[[order=]\d+] [,up=\d+] [,down=\d+] ` ::
+`--startup` `[[order=]\d+] [,up=\d+] [,down=\d+] ` ::

 
 Startup and shutdown behavior. Order is a non-negative number defining the general startup order. Shutdown in done with reverse ordering. Additionally you can set the 'up' or 'down' delay in seconds, which specifies a delay to wait before the next VM is started or stopped.
 
 
 Startup and shutdown behavior. Order is a non-negative number defining the general startup order. Shutdown in done with reverse ordering. Additionally you can set the 'up' or 'down' delay in seconds, which specifies a delay to wait before the next VM is started or stopped.
 

-`-swap` `<integer> (0 - N)` ('default =' `512`)::
+`--swap` `<integer> (0 - N)` ('default =' `512`)::

 
 Amount of SWAP for the VM in MB.
 
 
 Amount of SWAP for the VM in MB.
 

-`-template` `<boolean>` ('default =' `0`)::
+`--template` `<boolean>` ('default =' `0`)::

 
 Enable/disable Template.
 
 
 Enable/disable Template.
 

-`-tty` `<integer> (0 - 6)` ('default =' `2`)::
+`--tty` `<integer> (0 - 6)` ('default =' `2`)::

 
 Specify the number of tty available to the container
 
 
 Specify the number of tty available to the container
 

-`-unprivileged` `<boolean>` ('default =' `0`)::
+`--unprivileged` `<boolean>` ('default =' `0`)::

 
 Makes the container run as unprivileged user. (Should not be modified manually.)
 
 
 Makes the container run as unprivileged user. (Should not be modified manually.)
 

-`-unused[n]` `<string>` ::
+`--unused[n]` `<string>` ::

 
 Reference to unused volumes. This is used internally, and should not be modified manually.
 
 
 Reference to unused volumes. This is used internally, and should not be modified manually.
 


@@ -751,11 +751,11 @@ container, see lxc-stop(1) for details.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-forceStop` `<boolean>` ('default =' `0`)::
+`--forceStop` `<boolean>` ('default =' `0`)::

 
 Make sure the Container stops.
 
 
 Make sure the Container stops.
 

-`-timeout` `<integer> (0 - N)` ('default =' `60`)::
+`--timeout` `<integer> (0 - N)` ('default =' `60`)::

 
 Wait maximal timeout seconds.
 
 
 Wait maximal timeout seconds.
 


@@ -774,7 +774,7 @@ The (unique) ID of the VM.
 
 The name of the snapshot.
 
 
 The name of the snapshot.
 

-`-description` `<string>` ::
+`--description` `<string>` ::

 
 A textual description or comment.
 
 
 A textual description or comment.
 


@@ -789,7 +789,7 @@ Start the container.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 


@@ -804,7 +804,7 @@ Show CT status.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format
 
 
 Verbose output format
 


@@ -820,7 +820,7 @@ container.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 


@@ -837,7 +837,7 @@ The (unique) ID of the VM.
 
 
 
 
 
 

-*pct template* `<vmid> -experimental <boolean>` `[OPTIONS]`
+*pct template* `<vmid> --experimental <boolean>` `[OPTIONS]`

 
 Create a Template.
 
 
 Create a Template.
 


@@ -845,7 +845,7 @@ Create a Template.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-experimental` `<boolean>` ('default =' `0`)::
+`--experimental` `<boolean>` ('default =' `0`)::

 
 The template feature is experimental, set this flag if you know what you are doing.
 
 
 The template feature is experimental, set this flag if you know what you are doing.
 

diff --git a/pct.conf.5-opts.adoc b/pct.conf.5-opts.adoc
index 05bfa8221fc0d922dd612af24f3d2fb846b89932..fbced2d747db41ac22e133abacf374a2a04c22fb 100644 (file)
--- a/pct.conf.5-opts.adoc
+++ b/pct.conf.5-opts.adoc
@@ -90,7 +90,7 @@ Volume, device or directory to mount into the container.
 
 Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 
 
 Sets DNS server IP address for a container. Create will automatically use the setting from the host if you neither set searchdomain nor nameserver.
 

-`net[n]`: `name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<IPv4Format/CIDR>] [,ip6=<IPv6Format/CIDR>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]` ::
+`net[n]`: `name=<string> [,bridge=<bridge>] [,firewall=<1|0>] [,gw=<GatewayIPv4>] [,gw6=<GatewayIPv6>] [,hwaddr=<XX:XX:XX:XX:XX:XX>] [,ip=<(IPv4/CIDR|dhcp|manual)>] [,ip6=<(IPv6/CIDR|auto|dhcp|manual)>] [,mtu=<integer>] [,rate=<mbps>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,type=<veth>]` ::

 
 Specifies network interfaces for the container.
 
 
 Specifies network interfaces for the container.
 


@@ -114,11 +114,11 @@ Default gateway for IPv6 traffic.
 
 The interface MAC address. This is dynamically allocated by default, but you can set that statically if needed, for example to always have the same link-local IPv6 address. (lxc.network.hwaddr)
 
 
 The interface MAC address. This is dynamically allocated by default, but you can set that statically if needed, for example to always have the same link-local IPv6 address. (lxc.network.hwaddr)
 

-`ip`=`<IPv4Format/CIDR>` ;;
+`ip`=`<(IPv4/CIDR|dhcp|manual)>` ;;

 
 IPv4 address in CIDR format.
 
 
 IPv4 address in CIDR format.
 

-`ip6`=`<IPv6Format/CIDR>` ;;
+`ip6`=`<(IPv6/CIDR|auto|dhcp|manual)>` ;;

 
 IPv6 address in CIDR format.
 
 
 IPv6 address in CIDR format.
 

diff --git a/pve-firewall-macros.adoc b/pve-firewall-macros.adoc
index 5818a19d49343b8afbd775083c6b1ea5bb25cd67..84da137d14d21b253782af9d868f74ed170115ad 100644 (file)
--- a/pve-firewall-macros.adoc
+++ b/pve-firewall-macros.adoc
@@ -56,7 +56,7 @@
 |===========================================================
 
 [horizontal]
 |===========================================================
 
 [horizontal]

-'Ceph':: Ceph Storage Cluster traffic (Ceph Monitors, OSD & MDS Daemons)
+'Ceph':: Ceph Storage Cluster traffic (Ceph Monitors, OSD & MDS Deamons)

 
 [width="100%",options="header"]
 |===========================================================
 
 [width="100%",options="header"]
 |===========================================================

diff --git a/pve-firewall-rules-opts.adoc b/pve-firewall-rules-opts.adoc
index dbdc27488ecaf331a7329b1cd23911d1361dca65..5d7ba4811de7f2911a30b57aa8ea018752ec099f 100644 (file)
--- a/pve-firewall-rules-opts.adoc
+++ b/pve-firewall-rules-opts.adoc
@@ -1,24 +1,24 @@
-`-dest` `<string>` ::
+`--dest` `<string>` ::

 
 Restrict packet destination address. This can refer to a single IP address, an IP set ('+ipsetname') or an IP alias definition. You can also specify an address range like '20.34.101.207-201.3.9.99', or a list of IP addresses and networks (entries are separated by comma). Please do not mix IPv4 and IPv6 addresses inside such lists.
 
 
 Restrict packet destination address. This can refer to a single IP address, an IP set ('+ipsetname') or an IP alias definition. You can also specify an address range like '20.34.101.207-201.3.9.99', or a list of IP addresses and networks (entries are separated by comma). Please do not mix IPv4 and IPv6 addresses inside such lists.
 

-`-dport` `<string>` ::
+`--dport` `<string>` ::

 
 Restrict TCP/UDP destination port. You can use service names or simple numbers (0-65535), as defined in '/etc/services'. Port ranges can be specified with '\d+:\d+', for example '80:85', and you can use comma separated list to match several ports or ranges.
 
 
 Restrict TCP/UDP destination port. You can use service names or simple numbers (0-65535), as defined in '/etc/services'. Port ranges can be specified with '\d+:\d+', for example '80:85', and you can use comma separated list to match several ports or ranges.
 

-`-iface` `<string>` ::
+`--iface` `<string>` ::

 
 Network interface name. You have to use network configuration key names for VMs and containers ('net\d+'). Host related rules can use arbitrary strings.
 
 
 Network interface name. You have to use network configuration key names for VMs and containers ('net\d+'). Host related rules can use arbitrary strings.
 

-`-proto` `<string>` ::
+`--proto` `<string>` ::

 
 IP protocol. You can use protocol names ('tcp'/'udp') or simple numbers, as defined in '/etc/protocols'.
 
 
 IP protocol. You can use protocol names ('tcp'/'udp') or simple numbers, as defined in '/etc/protocols'.
 

-`-source` `<string>` ::
+`--source` `<string>` ::

 
 Restrict packet source address. This can refer to a single IP address, an IP set ('+ipsetname') or an IP alias definition. You can also specify an address range like '20.34.101.207-201.3.9.99', or a list of IP addresses and networks (entries are separated by comma). Please do not mix IPv4 and IPv6 addresses inside such lists.
 
 
 Restrict packet source address. This can refer to a single IP address, an IP set ('+ipsetname') or an IP alias definition. You can also specify an address range like '20.34.101.207-201.3.9.99', or a list of IP addresses and networks (entries are separated by comma). Please do not mix IPv4 and IPv6 addresses inside such lists.
 

-`-sport` `<string>` ::
+`--sport` `<string>` ::

 
 Restrict TCP/UDP source port. You can use service names or simple numbers (0-65535), as defined in '/etc/services'. Port ranges can be specified with '\d+:\d+', for example '80:85', and you can use comma separated list to match several ports or ranges.
 
 
 Restrict TCP/UDP source port. You can use service names or simple numbers (0-65535), as defined in '/etc/services'. Port ranges can be specified with '\d+:\d+', for example '80:85', and you can use comma separated list to match several ports or ranges.
 

diff --git a/pve-firewall.8-synopsis.adoc b/pve-firewall.8-synopsis.adoc
index c68aaa42d22f0b140ccdd81e6006e9108b4e2e78..729c81adce0d37c6a0fd3b92ffc1af2c15daa894 100644 (file)
--- a/pve-firewall.8-synopsis.adoc
+++ b/pve-firewall.8-synopsis.adoc
@@ -15,7 +15,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -40,35 +40,35 @@ Simulate firewall rules. This does not simulate kernel 'routing' table.
 Instead, this simply assumes that routing from source zone to destination
 zone is possible.
 
 Instead, this simply assumes that routing from source zone to destination
 zone is possible.
 

-`-dest` `<string>` ::
+`--dest` `<string>` ::

 
 Destination IP address.
 
 
 Destination IP address.
 

-`-dport` `<integer>` ::
+`--dport` `<integer>` ::

 
 Destination port.
 
 
 Destination port.
 

-`-from` `(host|outside|vm\d+|ct\d+|vmbr\d+/\S+)` ('default =' `outside`)::
+`--from` `(host|outside|vm\d+|ct\d+|vmbr\d+/\S+)` ('default =' `outside`)::

 
 Source zone.
 
 
 Source zone.
 

-`-protocol` `(tcp|udp)` ('default =' `tcp`)::
+`--protocol` `(tcp|udp)` ('default =' `tcp`)::

 
 Protocol.
 
 
 Protocol.
 

-`-source` `<string>` ::
+`--source` `<string>` ::

 
 Source IP address.
 
 
 Source IP address.
 

-`-sport` `<integer>` ::
+`--sport` `<integer>` ::

 
 Source port.
 
 
 Source port.
 

-`-to` `(host|outside|vm\d+|ct\d+|vmbr\d+/\S+)` ('default =' `host`)::
+`--to` `(host|outside|vm\d+|ct\d+|vmbr\d+/\S+)` ('default =' `host`)::

 
 Destination zone.
 
 
 Destination zone.
 

-`-verbose` `<boolean>` ('default =' `0`)::
+`--verbose` `<boolean>` ('default =' `0`)::

 
 Verbose output.
 
 
 Verbose output.
 


@@ -78,7 +78,7 @@ Verbose output.
 
 Start the Proxmox VE firewall service.
 
 
 Start the Proxmox VE firewall service.
 

-`-debug` `<boolean>` ('default =' `0`)::
+`--debug` `<boolean>` ('default =' `0`)::

 
 Debug mode - stay in foreground
 
 
 Debug mode - stay in foreground
 

diff --git a/pve-ha-crm.8-synopsis.adoc b/pve-ha-crm.8-synopsis.adoc
index 81ffb25fd90f5a9d330d654a1458b31cba8fab65..8a18e8a45ac4b2a6d24a289882a15d1537aeeac8 100644 (file)
--- a/pve-ha-crm.8-synopsis.adoc
+++ b/pve-ha-crm.8-synopsis.adoc
@@ -8,7 +8,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -19,7 +19,7 @@ Verbose output format.
 
 Start the daemon.
 
 
 Start the daemon.
 

-`-debug` `<boolean>` ('default =' `0`)::
+`--debug` `<boolean>` ('default =' `0`)::

 
 Debug mode - stay in foreground
 
 
 Debug mode - stay in foreground
 

diff --git a/pve-ha-lrm.8-synopsis.adoc b/pve-ha-lrm.8-synopsis.adoc
index c80bc9b97f0df3d046fa6342e61be397cff8cbec..c2723d6d303234c2a6c113a22175d041a11a92d7 100644 (file)
--- a/pve-ha-lrm.8-synopsis.adoc
+++ b/pve-ha-lrm.8-synopsis.adoc
@@ -8,7 +8,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -19,7 +19,7 @@ Verbose output format.
 
 Start the daemon.
 
 
 Start the daemon.
 

-`-debug` `<boolean>` ('default =' `0`)::
+`--debug` `<boolean>` ('default =' `0`)::

 
 Debug mode - stay in foreground
 
 
 Debug mode - stay in foreground
 

diff --git a/pveam.1-synopsis.adoc b/pveam.1-synopsis.adoc
index 3ba260c52eea3271c3cca42ccfbd785c27356cb4..abeb1076bc079d86a5926eb6a193073ea6382d9f 100644 (file)
--- a/pveam.1-synopsis.adoc
+++ b/pveam.1-synopsis.adoc
@@ -4,7 +4,7 @@
 
 List available templates.
 
 
 List available templates.
 

-`-section` `<system | turnkeylinux>` ::
+`--section` `<system | turnkeylinux>` ::

 
 Restrict list to specified section.
 
 
 Restrict list to specified section.
 


@@ -34,7 +34,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 

diff --git a/pveceph.1-synopsis.adoc b/pveceph.1-synopsis.adoc
index a1ee3ee52c9bd1627ae14122ea9fac2f264eff89..37d81171f1f698e1334d70ffc623f36ca876c508 100644 (file)
--- a/pveceph.1-synopsis.adoc
+++ b/pveceph.1-synopsis.adoc
@@ -1,8 +1,26 @@
 *pveceph* `<COMMAND> [ARGS] [OPTIONS]`
 
 *pveceph* `<COMMAND> [ARGS] [OPTIONS]`
 

-*pveceph createmon*
+*pveceph createmgr* `[OPTIONS]`

 
 

-Create Ceph Monitor
+Create Ceph Manager
+
+`--id` `[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?` ::
+
+The ID for the manager, when omitted the same as the nodename
+
+
+
+*pveceph createmon* `[OPTIONS]`
+
+Create Ceph Monitor and Manager
+
+`--exclude-manager` `<boolean>` ('default =' `0`)::
+
+When set, only a monitor will be created.
+
+`--id` `[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?` ::
+
+The ID for the monitor, when omitted the same as the nodename

 
 
 
 
 
 


@@ -15,17 +33,21 @@ Create OSD
 
 Block device name.
 
 
 Block device name.
 

-`-bluestore` `<boolean>` ('default =' `0`)::
+`--bluestore` `<boolean>` ('default =' `0`)::

 
 Use bluestore instead of filestore.
 
 
 Use bluestore instead of filestore.
 

-`-fstype` `<btrfs | ext4 | xfs>` ('default =' `xfs`)::
+`--fstype` `<btrfs | ext4 | xfs>` ('default =' `xfs`)::

 
 File system type (filestore only).
 
 
 File system type (filestore only).
 

-`-journal_dev` `<string>` ::
+`--journal_dev` `<string>` ::

 
 

-Block device name for journal.
+Block device name for journal (filestore) or block.db (bluestore).
+
+`--wal_dev` `<string>` ::
+
+Block device name for block.wal (bluestore only).

 
 
 
 
 
 


@@ -38,32 +60,54 @@ Create POOL
 
 The name of the pool. It must be unique.
 
 
 The name of the pool. It must be unique.
 

-`-crush_ruleset` `<integer> (0 - 32768)` ('default =' `0`)::
+`--add_storages` `<boolean>` ::
+
+Configure VM and CT storages using the new pool.

 
 

-The ruleset to use for mapping object placement in the cluster.
+`--application` `<cephfs | rbd | rgw>` ::

 
 

-`-min_size` `<integer> (1 - 7)` ('default =' `1`)::
+The application of the pool, 'rbd' by default.
+
+`--crush_rule` `<string>` ::
+
+The rule to use for mapping object placement in the cluster.
+
+`--min_size` `<integer> (1 - 7)` ('default =' `2`)::

 
 Minimum number of replicas per object
 
 
 Minimum number of replicas per object
 

-`-pg_num` `<integer> (8 - 32768)` ('default =' `64`)::
+`--pg_num` `<integer> (8 - 32768)` ('default =' `64`)::

 
 Number of placement groups.
 
 
 Number of placement groups.
 

-`-size` `<integer> (1 - 7)` ('default =' `2`)::
+`--size` `<integer> (1 - 7)` ('default =' `3`)::

 
 Number of replicas per object
 
 
 
 
 Number of replicas per object
 
 
 

-*pveceph destroymon* `<monid>`
+*pveceph destroymgr* `<id>`
+
+Destroy Ceph Manager.
+
+`<id>`: `[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?` ::
+
+The ID of the manager
+

 
 

-Destroy Ceph monitor.

 
 

-`<monid>`: `<integer>` ::
+*pveceph destroymon* `<monid>` `[OPTIONS]`
+
+Destroy Ceph Monitor and Manager.
+
+`<monid>`: `[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?` ::

 
 Monitor ID
 
 
 Monitor ID
 

+`--exclude-manager` `<boolean>` ('default =' `0`)::
+
+When set, removes only the monitor, not the manager
+

 
 
 
 
 
 


@@ -75,7 +119,7 @@ Destroy OSD
 
 OSD ID
 
 
 OSD ID
 

-`-cleanup` `<boolean>` ('default =' `0`)::
+`--cleanup` `<boolean>` ('default =' `0`)::

 
 If set, we remove partition table entries.
 
 
 If set, we remove partition table entries.
 


@@ -90,10 +134,14 @@ Destroy pool
 
 The name of the pool. It must be unique.
 
 
 The name of the pool. It must be unique.
 

-`-force` `<boolean>` ('default =' `0`)::
+`--force` `<boolean>` ('default =' `0`)::

 
 If true, destroys pool even if in use
 
 
 If true, destroys pool even if in use
 

+`--remove_storages` `<boolean>` ('default =' `0`)::
+
+Remove all pveceph-managed storages configured for this pool
+

 
 
 
 
 
 


@@ -105,7 +153,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -116,27 +164,27 @@ Verbose output format.
 
 Create initial ceph default configuration and setup symlinks.
 
 
 Create initial ceph default configuration and setup symlinks.
 

-`-disable_cephx` `<boolean>` ('default =' `0`)::
+`--disable_cephx` `<boolean>` ('default =' `0`)::

 
 Disable cephx authentification.
 +
 WARNING: cephx is a security feature protecting against man-in-the-middle attacks. Only consider disabling cephx if your network is private!
 
 
 Disable cephx authentification.
 +
 WARNING: cephx is a security feature protecting against man-in-the-middle attacks. Only consider disabling cephx if your network is private!
 

-`-min_size` `<integer> (1 - 7)` ('default =' `2`)::
+`--min_size` `<integer> (1 - 7)` ('default =' `2`)::

 
 Minimum number of available replicas per object to allow I/O
 
 
 Minimum number of available replicas per object to allow I/O
 

-`-network` `<string>` ::
+`--network` `<string>` ::

 
 Use specific network for all ceph related traffic
 
 
 Use specific network for all ceph related traffic
 

-`-pg_bits` `<integer> (6 - 14)` ('default =' `6`)::
+`--pg_bits` `<integer> (6 - 14)` ('default =' `6`)::

 
 Placement group bits, used to specify the default number of placement groups.
 +
 NOTE: 'osd pool default pg num' does not work for default pools.
 
 
 Placement group bits, used to specify the default number of placement groups.
 +
 NOTE: 'osd pool default pg num' does not work for default pools.
 

-`-size` `<integer> (1 - 7)` ('default =' `3`)::
+`--size` `<integer> (1 - 7)` ('default =' `3`)::

 
 Targeted number of replicas per object
 
 
 Targeted number of replicas per object
 


@@ -147,7 +195,7 @@ Targeted number of replicas per object
 
 Install ceph related packages.
 
 
 Install ceph related packages.
 

-`-version` `<luminous>` ::
+`--version` `<luminous>` ::

 
 no description available
 
 
 no description available
 


@@ -172,7 +220,7 @@ Destroy ceph related data and configuration files.
 
 Start ceph services.
 
 
 Start ceph services.
 

-`<service>`: `(mon|mds|osd)\.[A-Za-z0-9]{1,32}` ::
+`<service>`: `(mon|mds|osd|mgr)\.[A-Za-z0-9\-]{1,32}` ::

 
 Ceph service name.
 
 
 Ceph service name.
 


@@ -188,7 +236,7 @@ Get ceph status.
 
 Stop ceph services.
 
 
 Stop ceph services.
 

-`<service>`: `(mon|mds|osd)\.[A-Za-z0-9]{1,32}` ::
+`<service>`: `(mon|mds|osd|mgr)\.[A-Za-z0-9\-]{1,32}` ::

 
 Ceph service name.
 
 
 Ceph service name.
 

diff --git a/pvecm.1-synopsis.adoc b/pvecm.1-synopsis.adoc
index 9ff6232a1f9ffcd2e93aa15ac2352cd2c5bfcb90..49d3cdf3d1bedaaab6d9b778bce887cd449ebb6e 100644 (file)
--- a/pvecm.1-synopsis.adoc
+++ b/pvecm.1-synopsis.adoc
@@ -8,23 +8,23 @@ Adds the current node to an existing cluster.
 
 Hostname (or IP) of an existing cluster member.
 
 
 Hostname (or IP) of an existing cluster member.
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Do not throw error if node already exists.
 
 
 Do not throw error if node already exists.
 

-`-nodeid` `<integer> (1 - N)` ::
+`--nodeid` `<integer> (1 - N)` ::

 
 Node id for this node.
 
 
 Node id for this node.
 

-`-ring0_addr` `<string>` ::
+`--ring0_addr` `<string>` ::

 
 Hostname (or IP) of the corosync ring0 address of this node. Defaults to nodes hostname.
 
 
 Hostname (or IP) of the corosync ring0 address of this node. Defaults to nodes hostname.
 

-`-ring1_addr` `<string>` ::
+`--ring1_addr` `<string>` ::

 
 Hostname (or IP) of the corosync ring1 address, this needs an valid configured ring 1 interface in the cluster.
 
 
 Hostname (or IP) of the corosync ring1 address, this needs an valid configured ring 1 interface in the cluster.
 

-`-votes` `<integer> (0 - N)` ::
+`--votes` `<integer> (0 - N)` ::

 
 Number of votes for this node
 
 
 Number of votes for this node
 


@@ -38,23 +38,23 @@ Adds a node to the cluster configuration.
 
 The cluster node name.
 
 
 The cluster node name.
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Do not throw error if node already exists.
 
 
 Do not throw error if node already exists.
 

-`-nodeid` `<integer> (1 - N)` ::
+`--nodeid` `<integer> (1 - N)` ::

 
 Node id for this node.
 
 
 Node id for this node.
 

-`-ring0_addr` `<string>` ::
+`--ring0_addr` `<string>` ::

 
 Hostname (or IP) of the corosync ring0 address of this node. Defaults to nodes hostname.
 
 
 Hostname (or IP) of the corosync ring0 address of this node. Defaults to nodes hostname.
 

-`-ring1_addr` `<string>` ::
+`--ring1_addr` `<string>` ::

 
 Hostname (or IP) of the corosync ring1 address, this needs an valid bindnet1_addr.
 
 
 Hostname (or IP) of the corosync ring1 address, this needs an valid bindnet1_addr.
 

-`-votes` `<integer> (0 - N)` ::
+`--votes` `<integer> (0 - N)` ::

 
 Number of votes for this node
 
 
 Number of votes for this node
 


@@ -68,27 +68,27 @@ Generate new cluster configuration.
 
 The name of the cluster.
 
 
 The name of the cluster.
 

-`-bindnet0_addr` `<string>` ::
+`--bindnet0_addr` `<string>` ::

 
 This specifies the network address the corosync ring 0 executive should bind to and defaults to the local IP address of the node.
 
 
 This specifies the network address the corosync ring 0 executive should bind to and defaults to the local IP address of the node.
 

-`-bindnet1_addr` `<string>` ::
+`--bindnet1_addr` `<string>` ::

 
 This specifies the network address the corosync ring 1 executive should bind to and is optional.
 
 
 This specifies the network address the corosync ring 1 executive should bind to and is optional.
 

-`-nodeid` `<integer> (1 - N)` ::
+`--nodeid` `<integer> (1 - N)` ::

 
 Node id for this node.
 
 
 Node id for this node.
 

-`-ring0_addr` `<string>` ::
+`--ring0_addr` `<string>` ::

 
 Hostname (or IP) of the corosync ring0 address of this node. Defaults to the hostname of the node.
 
 
 Hostname (or IP) of the corosync ring0 address of this node. Defaults to the hostname of the node.
 

-`-ring1_addr` `<string>` ::
+`--ring1_addr` `<string>` ::

 
 Hostname (or IP) of the corosync ring1 address, this needs an valid bindnet1_addr.
 
 
 Hostname (or IP) of the corosync ring1 address, this needs an valid bindnet1_addr.
 

-`-votes` `<integer> (1 - N)` ::
+`--votes` `<integer> (1 - N)` ::

 
 Number of votes for this node.
 
 
 Number of votes for this node.
 


@@ -123,7 +123,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -148,15 +148,15 @@ Used by VM/CT migration - do not use manually.
 
 Extra arguments as array
 
 
 Extra arguments as array
 

-`-get_migration_ip` `<boolean>` ('default =' `0`)::
+`--get_migration_ip` `<boolean>` ('default =' `0`)::

 
 return the migration IP, if configured
 
 
 return the migration IP, if configured
 

-`-migration_network` `<string>` ::
+`--migration_network` `<string>` ::

 
 the migration network used to detect the local migration IP
 
 
 the migration network used to detect the local migration IP
 

-`-run-command` `<boolean>` ::
+`--run-command` `<boolean>` ::

 
 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.
 
 
 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.
 


@@ -178,11 +178,11 @@ Displays the local view of the cluster status.
 
 Update node certificates (and generate all needed files/directories).
 
 
 Update node certificates (and generate all needed files/directories).
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Force generation of new SSL certifate.
 
 
 Force generation of new SSL certifate.
 

-`-silent` `<boolean>` ::
+`--silent` `<boolean>` ::

 
 Ignore errors (i.e. when cluster has no quorum).
 
 
 Ignore errors (i.e. when cluster has no quorum).
 

diff --git a/pvedaemon.8-synopsis.adoc b/pvedaemon.8-synopsis.adoc
index 1ad5ee2998920c05017d31604e6e2f6b4ebf1c0a..23d1427bfe8c927c0c402fa2af859b41c989334f 100644 (file)
--- a/pvedaemon.8-synopsis.adoc
+++ b/pvedaemon.8-synopsis.adoc
@@ -8,7 +8,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -25,7 +25,7 @@ Restart the daemon (or start if not running).
 
 Start the daemon.
 
 
 Start the daemon.
 

-`-debug` `<boolean>` ('default =' `0`)::
+`--debug` `<boolean>` ('default =' `0`)::

 
 Debug mode - stay in foreground
 
 
 Debug mode - stay in foreground
 

diff --git a/pveproxy.8-synopsis.adoc b/pveproxy.8-synopsis.adoc
index 90ebadc63149814e5d612da6504e83148941a6ad..b6022009c571c411d3eb52c449632645a0747cca 100644 (file)
--- a/pveproxy.8-synopsis.adoc
+++ b/pveproxy.8-synopsis.adoc
@@ -8,7 +8,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -25,7 +25,7 @@ Restart the daemon (or start if not running).
 
 Start the daemon.
 
 
 Start the daemon.
 

-`-debug` `<boolean>` ('default =' `0`)::
+`--debug` `<boolean>` ('default =' `0`)::

 
 Debug mode - stay in foreground
 
 
 Debug mode - stay in foreground
 

diff --git a/pvesm.1-synopsis.adoc b/pvesm.1-synopsis.adoc
index df90d7c26640878e390b0b107d73164c92574e9e..326c6038218ee93ee7475f86c771574d377b34dc 100644 (file)
--- a/pvesm.1-synopsis.adoc
+++ b/pvesm.1-synopsis.adoc
@@ -12,147 +12,147 @@ Storage type.
 
 The storage identifier.
 
 
 The storage identifier.
 

-`-authsupported` `<string>` ::
+`--authsupported` `<string>` ::

 
 Authsupported.
 
 
 Authsupported.
 

-`-base` `<string>` ::
+`--base` `<string>` ::

 
 Base volume. This volume is automatically activated.
 
 
 Base volume. This volume is automatically activated.
 

-`-blocksize` `<string>` ::
+`--blocksize` `<string>` ::

 
 block size
 
 
 block size
 

-`-comstar_hg` `<string>` ::
+`--comstar_hg` `<string>` ::

 
 host group for comstar views
 
 
 host group for comstar views
 

-`-comstar_tg` `<string>` ::
+`--comstar_tg` `<string>` ::

 
 target group for comstar views
 
 
 target group for comstar views
 

-`-content` `<string>` ::
+`--content` `<string>` ::

 
 Allowed content types.
 +
 NOTE: the value 'rootdir' is used for Containers, and value 'images' for VMs.
 
 
 Allowed content types.
 +
 NOTE: the value 'rootdir' is used for Containers, and value 'images' for VMs.
 

-`-disable` `<boolean>` ::
+`--disable` `<boolean>` ::

 
 Flag to disable the storage.
 
 
 Flag to disable the storage.
 

-`-export` `<string>` ::
+`--export` `<string>` ::

 
 NFS export path.
 
 
 NFS export path.
 

-`-format` `<string>` ::
+`--format` `<string>` ::

 
 Default image format.
 
 
 Default image format.
 

-`-is_mountpoint` `<boolean>` ('default =' `no`)::
+`--is_mountpoint` `<string>` ('default =' `no`)::

 
 

-Assume the directory is an externally managed mountpoint. If nothing is mounted the storage will be considered offline.
+Assume the given path is an externally managed mountpoint and consider the storage offline if it is not mounted. Using a boolean (yes/no) value serves as a shortcut to using the target path in this field.

 
 

-`-iscsiprovider` `<string>` ::
+`--iscsiprovider` `<string>` ::

 
 iscsi provider
 
 
 iscsi provider
 

-`-krbd` `<boolean>` ::
+`--krbd` `<boolean>` ::

 
 Access rbd through krbd kernel module.
 
 
 Access rbd through krbd kernel module.
 

-`-maxfiles` `<integer> (0 - N)` ::
+`--maxfiles` `<integer> (0 - N)` ::

 
 Maximal number of backup files per VM. Use '0' for unlimted.
 
 
 Maximal number of backup files per VM. Use '0' for unlimted.
 

-`-mkdir` `<boolean>` ('default =' `yes`)::
+`--mkdir` `<boolean>` ('default =' `yes`)::

 
 Create the directory if it doesn't exist.
 
 
 Create the directory if it doesn't exist.
 

-`-monhost` `<string>` ::
+`--monhost` `<string>` ::

 
 

-Monitors daemon ips.
+IP addresses of monitors (for external clusters).

 
 

-`-nodes` `<string>` ::
+`--nodes` `<string>` ::

 
 List of cluster node names.
 
 
 List of cluster node names.
 

-`-nowritecache` `<boolean>` ::
+`--nowritecache` `<boolean>` ::

 
 disable write caching on the target
 
 
 disable write caching on the target
 

-`-options` `<string>` ::
+`--options` `<string>` ::

 
 NFS mount options (see 'man nfs')
 
 
 NFS mount options (see 'man nfs')
 

-`-path` `<string>` ::
+`--path` `<string>` ::

 
 File system path.
 
 
 File system path.
 

-`-pool` `<string>` ::
+`--pool` `<string>` ::

 
 Pool.
 
 
 Pool.
 

-`-portal` `<string>` ::
+`--portal` `<string>` ::

 
 iSCSI portal (IP or DNS name with optional port).
 
 
 iSCSI portal (IP or DNS name with optional port).
 

-`-redundancy` `<integer> (1 - 16)` ('default =' `2`)::
+`--redundancy` `<integer> (1 - 16)` ('default =' `2`)::

 
 The redundancy count specifies the number of nodes to which the resource should be deployed. It must be at least 1 and at most the number of nodes in the cluster.
 
 
 The redundancy count specifies the number of nodes to which the resource should be deployed. It must be at least 1 and at most the number of nodes in the cluster.
 

-`-saferemove` `<boolean>` ::
+`--saferemove` `<boolean>` ::

 
 Zero-out data when removing LVs.
 
 
 Zero-out data when removing LVs.
 

-`-saferemove_throughput` `<string>` ::
+`--saferemove_throughput` `<string>` ::

 
 Wipe throughput (cstream -t parameter value).
 
 
 Wipe throughput (cstream -t parameter value).
 

-`-server` `<string>` ::
+`--server` `<string>` ::

 
 Server IP or DNS name.
 
 
 Server IP or DNS name.
 

-`-server2` `<string>` ::
+`--server2` `<string>` ::

 
 Backup volfile server IP or DNS name.
 +
 NOTE: Requires option(s): `server`
 
 
 Backup volfile server IP or DNS name.
 +
 NOTE: Requires option(s): `server`
 

-`-shared` `<boolean>` ::
+`--shared` `<boolean>` ::

 
 Mark storage as shared.
 
 
 Mark storage as shared.
 

-`-sparse` `<boolean>` ::
+`--sparse` `<boolean>` ::

 
 use sparse volumes
 
 
 use sparse volumes
 

-`-tagged_only` `<boolean>` ::
+`--tagged_only` `<boolean>` ::

 
 Only use logical volumes tagged with 'pve-vm-ID'.
 
 
 Only use logical volumes tagged with 'pve-vm-ID'.
 

-`-target` `<string>` ::
+`--target` `<string>` ::

 
 iSCSI target.
 
 
 iSCSI target.
 

-`-thinpool` `<string>` ::
+`--thinpool` `<string>` ::

 
 LVM thin pool LV name.
 
 
 LVM thin pool LV name.
 

-`-transport` `<rdma | tcp | unix>` ::
+`--transport` `<rdma | tcp | unix>` ::

 
 Gluster transport: tcp or rdma
 
 
 Gluster transport: tcp or rdma
 

-`-username` `<string>` ::
+`--username` `<string>` ::

 
 RBD Id.
 
 
 RBD Id.
 

-`-vgname` `<string>` ::
+`--vgname` `<string>` ::

 
 Volume group name.
 
 
 Volume group name.
 

-`-volume` `<string>` ::
+`--volume` `<string>` ::

 
 Glusterfs Volume.
 
 
 Glusterfs Volume.
 


@@ -179,7 +179,7 @@ The name of the file to create.
 
 Size in kilobyte (1024 bytes). Optional suffixes 'M' (megabyte, 1024K) and 'G' (gigabyte, 1024M)
 
 
 Size in kilobyte (1024 bytes). Optional suffixes 'M' (megabyte, 1024K) and 'G' (gigabyte, 1024M)
 

-`-format` `<qcow2 | raw | subvol>` ::
+`--format` `<qcow2 | raw | subvol>` ::

 
 no description available
 +
 
 no description available
 +


@@ -204,15 +204,15 @@ Export stream format
 
 Destination file name
 
 
 Destination file name
 

-`-base` `(?^:[a-z0-9_\-]{1,40})` ::
+`--base` `(?^:[a-z0-9_\-]{1,40})` ::

 
 Snapshot to start an incremental stream from
 
 
 Snapshot to start an incremental stream from
 

-`-snapshot` `(?^:[a-z0-9_\-]{1,40})` ::
+`--snapshot` `(?^:[a-z0-9_\-]{1,40})` ::

 
 Snapshot to export
 
 
 Snapshot to export
 

-`-with-snapshots` `<boolean>` ('default =' `0`)::
+`--with-snapshots` `<boolean>` ('default =' `0`)::

 
 Whether to include intermediate snapshots in the stream
 
 
 Whether to include intermediate snapshots in the stream
 


@@ -237,7 +237,7 @@ Delete volume
 
 Volume identifier
 
 
 Volume identifier
 

-`-storage` `<string>` ::
+`--storage` `<string>` ::

 
 The storage identifier.
 
 
 The storage identifier.
 


@@ -263,7 +263,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -286,26 +286,26 @@ Import stream format
 
 Source file name
 
 
 Source file name
 

-`-base` `(?^:[a-z0-9_\-]{1,40})` ::
+`--base` `(?^:[a-z0-9_\-]{1,40})` ::

 
 Base snapshot of an incremental stream
 
 
 Base snapshot of an incremental stream
 

-`-delete-snapshot` `(?^:[a-z0-9_\-]{1,80})` ::
+`--delete-snapshot` `(?^:[a-z0-9_\-]{1,80})` ::

 
 A snapshot to delete on success
 
 
 A snapshot to delete on success
 

-`-with-snapshots` `<boolean>` ('default =' `0`)::
+`--with-snapshots` `<boolean>` ('default =' `0`)::

 
 Whether the stream includes intermediate snapshots
 
 
 
 
 
 Whether the stream includes intermediate snapshots
 
 
 
 

-*pvesm iscsiscan* `-portal <string>` `[OPTIONS]`
+*pvesm iscsiscan* `--portal <string>` `[OPTIONS]`

 
 Scan remote iSCSI server.
 
 
 Scan remote iSCSI server.
 

-`-portal` `<string>` ::
+`--portal` `<string>` ::

 
 no description available
 
 
 no description available
 


@@ -320,11 +320,11 @@ List storage content.
 
 The storage identifier.
 
 
 The storage identifier.
 

-`-content` `<string>` ::
+`--content` `<string>` ::

 
 Only list content of this type.
 
 
 Only list content of this type.
 

-`-vmid` `<integer> (1 - N)` ::
+`--vmid` `<integer> (1 - N)` ::

 
 Only list images for this VM
 
 
 Only list images for this VM
 


@@ -387,111 +387,115 @@ Update storage configuration.
 
 The storage identifier.
 
 
 The storage identifier.
 

-`-blocksize` `<string>` ::
+`--blocksize` `<string>` ::

 
 block size
 
 
 block size
 

-`-comstar_hg` `<string>` ::
+`--comstar_hg` `<string>` ::

 
 host group for comstar views
 
 
 host group for comstar views
 

-`-comstar_tg` `<string>` ::
+`--comstar_tg` `<string>` ::

 
 target group for comstar views
 
 
 target group for comstar views
 

-`-content` `<string>` ::
+`--content` `<string>` ::

 
 Allowed content types.
 +
 NOTE: the value 'rootdir' is used for Containers, and value 'images' for VMs.
 
 
 Allowed content types.
 +
 NOTE: the value 'rootdir' is used for Containers, and value 'images' for VMs.
 

-`-delete` `<string>` ::
+`--delete` `<string>` ::

 
 A list of settings you want to delete.
 
 
 A list of settings you want to delete.
 

-`-digest` `<string>` ::
+`--digest` `<string>` ::

 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 
 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 

-`-disable` `<boolean>` ::
+`--disable` `<boolean>` ::

 
 Flag to disable the storage.
 
 
 Flag to disable the storage.
 

-`-format` `<string>` ::
+`--format` `<string>` ::

 
 Default image format.
 
 
 Default image format.
 

-`-is_mountpoint` `<boolean>` ('default =' `no`)::
+`--is_mountpoint` `<string>` ('default =' `no`)::

 
 

-Assume the directory is an externally managed mountpoint. If nothing is mounted the storage will be considered offline.
+Assume the given path is an externally managed mountpoint and consider the storage offline if it is not mounted. Using a boolean (yes/no) value serves as a shortcut to using the target path in this field.

 
 

-`-krbd` `<boolean>` ::
+`--krbd` `<boolean>` ::

 
 Access rbd through krbd kernel module.
 
 
 Access rbd through krbd kernel module.
 

-`-maxfiles` `<integer> (0 - N)` ::
+`--maxfiles` `<integer> (0 - N)` ::

 
 Maximal number of backup files per VM. Use '0' for unlimted.
 
 
 Maximal number of backup files per VM. Use '0' for unlimted.
 

-`-mkdir` `<boolean>` ('default =' `yes`)::
+`--mkdir` `<boolean>` ('default =' `yes`)::

 
 Create the directory if it doesn't exist.
 
 
 Create the directory if it doesn't exist.
 

-`-nodes` `<string>` ::
+`--monhost` `<string>` ::
+
+IP addresses of monitors (for external clusters).
+
+`--nodes` `<string>` ::

 
 List of cluster node names.
 
 
 List of cluster node names.
 

-`-nowritecache` `<boolean>` ::
+`--nowritecache` `<boolean>` ::

 
 disable write caching on the target
 
 
 disable write caching on the target
 

-`-options` `<string>` ::
+`--options` `<string>` ::

 
 NFS mount options (see 'man nfs')
 
 
 NFS mount options (see 'man nfs')
 

-`-pool` `<string>` ::
+`--pool` `<string>` ::

 
 Pool.
 
 
 Pool.
 

-`-redundancy` `<integer> (1 - 16)` ('default =' `2`)::
+`--redundancy` `<integer> (1 - 16)` ('default =' `2`)::

 
 The redundancy count specifies the number of nodes to which the resource should be deployed. It must be at least 1 and at most the number of nodes in the cluster.
 
 
 The redundancy count specifies the number of nodes to which the resource should be deployed. It must be at least 1 and at most the number of nodes in the cluster.
 

-`-saferemove` `<boolean>` ::
+`--saferemove` `<boolean>` ::

 
 Zero-out data when removing LVs.
 
 
 Zero-out data when removing LVs.
 

-`-saferemove_throughput` `<string>` ::
+`--saferemove_throughput` `<string>` ::

 
 Wipe throughput (cstream -t parameter value).
 
 
 Wipe throughput (cstream -t parameter value).
 

-`-server` `<string>` ::
+`--server` `<string>` ::

 
 Server IP or DNS name.
 
 
 Server IP or DNS name.
 

-`-server2` `<string>` ::
+`--server2` `<string>` ::

 
 Backup volfile server IP or DNS name.
 +
 NOTE: Requires option(s): `server`
 
 
 Backup volfile server IP or DNS name.
 +
 NOTE: Requires option(s): `server`
 

-`-shared` `<boolean>` ::
+`--shared` `<boolean>` ::

 
 Mark storage as shared.
 
 
 Mark storage as shared.
 

-`-sparse` `<boolean>` ::
+`--sparse` `<boolean>` ::

 
 use sparse volumes
 
 
 use sparse volumes
 

-`-tagged_only` `<boolean>` ::
+`--tagged_only` `<boolean>` ::

 
 Only use logical volumes tagged with 'pve-vm-ID'.
 
 
 Only use logical volumes tagged with 'pve-vm-ID'.
 

-`-transport` `<rdma | tcp | unix>` ::
+`--transport` `<rdma | tcp | unix>` ::

 
 Gluster transport: tcp or rdma
 
 
 Gluster transport: tcp or rdma
 

-`-username` `<string>` ::
+`--username` `<string>` ::

 
 RBD Id.
 
 
 RBD Id.
 


@@ -502,19 +506,19 @@ RBD Id.
 
 Get status for all datastores.
 
 
 Get status for all datastores.
 

-`-content` `<string>` ::
+`--content` `<string>` ::

 
 Only list stores which support this content type.
 
 
 Only list stores which support this content type.
 

-`-enabled` `<boolean>` ('default =' `0`)::
+`--enabled` `<boolean>` ('default =' `0`)::

 
 Only list stores which are enabled (not disabled in config).
 
 
 Only list stores which are enabled (not disabled in config).
 

-`-storage` `<string>` ::
+`--storage` `<string>` ::

 
 Only list status for  specified storage
 
 
 Only list status for  specified storage
 

-`-target` `<string>` ::
+`--target` `<string>` ::

 
 If target is different to 'node', we only lists shared storages which content is accessible on this 'node' and the specified 'target' node.
 
 
 If target is different to 'node', we only lists shared storages which content is accessible on this 'node' and the specified 'target' node.
 

diff --git a/pvesr.1-synopsis.adoc b/pvesr.1-synopsis.adoc
index 4363b9df03ebc0af0f3282876bb02515a6f664dc..5ad776e7d74c571c3c762502972fbebef415b1dc 100644 (file)
--- a/pvesr.1-synopsis.adoc
+++ b/pvesr.1-synopsis.adoc
@@ -12,23 +12,23 @@ Replication Job ID. The ID is composed of a Guest ID and a job number, separated
 
 Target node.
 
 
 Target node.
 

-`-comment` `<string>` ::
+`--comment` `<string>` ::

 
 Description.
 
 
 Description.
 

-`-disable` `<boolean>` ::
+`--disable` `<boolean>` ::

 
 Flag to disable/deactivate the entry.
 
 
 Flag to disable/deactivate the entry.
 

-`-rate` `<number> (1 - N)` ::
+`--rate` `<number> (1 - N)` ::

 
 Rate limit in mbps (megabytes per second) as floating point number.
 
 
 Rate limit in mbps (megabytes per second) as floating point number.
 

-`-remove_job` `<full | local>` ::
+`--remove_job` `<full | local>` ::

 
 Mark the replication job for removal. The job will remove all local replication snapshots. When set to 'full', it also tries to remove replicated volumes on the target. The job then removes itself from the configuration file.
 
 
 Mark the replication job for removal. The job will remove all local replication snapshots. When set to 'full', it also tries to remove replicated volumes on the target. The job then removes itself from the configuration file.
 

-`-schedule` `<string>` ('default =' `*/15`)::
+`--schedule` `<string>` ('default =' `*/15`)::

 
 Storage replication schedule. The format is a subset of `systemd` calender events.
 
 
 Storage replication schedule. The format is a subset of `systemd` calender events.
 


@@ -42,11 +42,11 @@ Mark replication job for removal.
 
 Replication Job ID. The ID is composed of a Guest ID and a job number, separated by a hyphen, i.e. '<GUEST>-<JOBNUM>'.
 
 
 Replication Job ID. The ID is composed of a Guest ID and a job number, separated by a hyphen, i.e. '<GUEST>-<JOBNUM>'.
 

-`-force` `<boolean>` ('default =' `0`)::
+`--force` `<boolean>` ('default =' `0`)::

 
 Will remove the jobconfig entry, but will not cleanup.
 
 
 Will remove the jobconfig entry, but will not cleanup.
 

-`-keep` `<boolean>` ('default =' `0`)::
+`--keep` `<boolean>` ('default =' `0`)::

 
 Keep replicated data at target (do not remove).
 
 
 Keep replicated data at target (do not remove).
 


@@ -86,7 +86,7 @@ Replication Job ID. The ID is composed of a Guest ID and a job number, separated
 
 The list of volume IDs to consider.
 
 
 The list of volume IDs to consider.
 

-`-last_sync` `<integer> (0 - N)` ::
+`--last_sync` `<integer> (0 - N)` ::

 
 Time (UNIX epoch) of last successful sync. If not specified, all replication snapshots gets removed.
 
 
 Time (UNIX epoch) of last successful sync. If not specified, all replication snapshots gets removed.
 


@@ -101,7 +101,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -134,19 +134,19 @@ Replication Job ID. The ID is composed of a Guest ID and a job number, separated
 
 The list of volume IDs to consider.
 
 
 The list of volume IDs to consider.
 

-`-force` `<boolean>` ('default =' `0`)::
+`--force` `<boolean>` ('default =' `0`)::

 
 Allow to remove all existion volumes (empty volume list).
 
 
 Allow to remove all existion volumes (empty volume list).
 

-`-last_sync` `<integer> (0 - N)` ::
+`--last_sync` `<integer> (0 - N)` ::

 
 Time (UNIX epoch) of last successful sync. If not specified, all replication snapshots get removed.
 
 
 Time (UNIX epoch) of last successful sync. If not specified, all replication snapshots get removed.
 

-`-parent_snapname` `<string>` ::
+`--parent_snapname` `<string>` ::

 
 The name of the snapshot.
 
 
 The name of the snapshot.
 

-`-scan` `<string>` ::
+`--scan` `<string>` ::

 
 List of storage IDs to scan for stale volumes.
 
 
 List of storage IDs to scan for stale volumes.
 


@@ -169,11 +169,11 @@ Replication Job ID. The ID is composed of a Guest ID and a job number, separated
 This method is called by the systemd-timer and executes all (or a specific)
 sync jobs.
 
 This method is called by the systemd-timer and executes all (or a specific)
 sync jobs.
 

-`-id` `[1-9][0-9]{2,8}-\d{1,9}` ::
+`--id` `[1-9][0-9]{2,8}-\d{1,9}` ::

 
 Replication Job ID. The ID is composed of a Guest ID and a job number, separated by a hyphen, i.e. '<GUEST>-<JOBNUM>'.
 
 
 Replication Job ID. The ID is composed of a Guest ID and a job number, separated by a hyphen, i.e. '<GUEST>-<JOBNUM>'.
 

-`-verbose` `<boolean>` ('default =' `0`)::
+`--verbose` `<boolean>` ('default =' `0`)::

 
 Print more verbose logs to stdout.
 
 
 Print more verbose logs to stdout.
 


@@ -211,7 +211,7 @@ Job state as JSON decoded string.
 
 List status of all replication jobs on this node.
 
 
 List status of all replication jobs on this node.
 

-`-guest` `<integer> (1 - N)` ::
+`--guest` `<integer> (1 - N)` ::

 
 Only list replication jobs for this guest.
 
 
 Only list replication jobs for this guest.
 


@@ -226,31 +226,31 @@ Update replication job configuration.
 
 Replication Job ID. The ID is composed of a Guest ID and a job number, separated by a hyphen, i.e. '<GUEST>-<JOBNUM>'.
 
 
 Replication Job ID. The ID is composed of a Guest ID and a job number, separated by a hyphen, i.e. '<GUEST>-<JOBNUM>'.
 

-`-comment` `<string>` ::
+`--comment` `<string>` ::

 
 Description.
 
 
 Description.
 

-`-delete` `<string>` ::
+`--delete` `<string>` ::

 
 A list of settings you want to delete.
 
 
 A list of settings you want to delete.
 

-`-digest` `<string>` ::
+`--digest` `<string>` ::

 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 
 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 

-`-disable` `<boolean>` ::
+`--disable` `<boolean>` ::

 
 Flag to disable/deactivate the entry.
 
 
 Flag to disable/deactivate the entry.
 

-`-rate` `<number> (1 - N)` ::
+`--rate` `<number> (1 - N)` ::

 
 Rate limit in mbps (megabytes per second) as floating point number.
 
 
 Rate limit in mbps (megabytes per second) as floating point number.
 

-`-remove_job` `<full | local>` ::
+`--remove_job` `<full | local>` ::

 
 Mark the replication job for removal. The job will remove all local replication snapshots. When set to 'full', it also tries to remove replicated volumes on the target. The job then removes itself from the configuration file.
 
 
 Mark the replication job for removal. The job will remove all local replication snapshots. When set to 'full', it also tries to remove replicated volumes on the target. The job then removes itself from the configuration file.
 

-`-schedule` `<string>` ('default =' `*/15`)::
+`--schedule` `<string>` ('default =' `*/15`)::

 
 Storage replication schedule. The format is a subset of `systemd` calender events.
 
 
 Storage replication schedule. The format is a subset of `systemd` calender events.
 

diff --git a/pvestatd.8-synopsis.adoc b/pvestatd.8-synopsis.adoc
index 1dda4f412b61a87ee5e697bc0a26497ed4569c1c..6735a0560608f1fc22219c9d03c9af4954340c6b 100644 (file)
--- a/pvestatd.8-synopsis.adoc
+++ b/pvestatd.8-synopsis.adoc
@@ -8,7 +8,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -25,7 +25,7 @@ Restart the daemon (or start if not running).
 
 Start the daemon.
 
 
 Start the daemon.
 

-`-debug` `<boolean>` ('default =' `0`)::
+`--debug` `<boolean>` ('default =' `0`)::

 
 Debug mode - stay in foreground
 
 
 Debug mode - stay in foreground
 

diff --git a/pvesubscription.1-synopsis.adoc b/pvesubscription.1-synopsis.adoc
index 85feb32c65871ee6c217ad78730828d2670c3f7a..371e83f48a64df77e0dca18286621f639c366308 100644 (file)
--- a/pvesubscription.1-synopsis.adoc
+++ b/pvesubscription.1-synopsis.adoc
@@ -15,7 +15,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -26,7 +26,7 @@ Verbose output format.
 
 Set subscription key.
 
 
 Set subscription key.
 

-`<key>`: `<string>` ::
+`<key>`: `pve([124])([cbsp])-[0-9a-f]{10}` ::

 
 Proxmox VE subscription key
 
 
 Proxmox VE subscription key
 


@@ -36,7 +36,7 @@ Proxmox VE subscription key
 
 Update subscription info.
 
 
 Update subscription info.
 

-`-force` `<boolean>` ('default =' `0`)::
+`--force` `<boolean>` ('default =' `0`)::

 
 Always connect to server, even if we have up to date info inside local cache.
 
 
 Always connect to server, even if we have up to date info inside local cache.
 

diff --git a/pveum.1-synopsis.adoc b/pveum.1-synopsis.adoc
index d9fbde635513d1572453a40d6898fbfac639111b..6755db35f69f0e89460215577fc15d8c973b060a 100644 (file)
--- a/pveum.1-synopsis.adoc
+++ b/pveum.1-synopsis.adoc
@@ -1,6 +1,6 @@
 *pveum* `<COMMAND> [ARGS] [OPTIONS]`
 
 *pveum* `<COMMAND> [ARGS] [OPTIONS]`
 

-*pveum acldel* `<path> -roles <string>` `[OPTIONS]`
+*pveum acldel* `<path> --roles <string>` `[OPTIONS]`

 
 Update Access Control List (add or remove permissions).
 
 
 Update Access Control List (add or remove permissions).
 


@@ -8,25 +8,25 @@ Update Access Control List (add or remove permissions).
 
 Access control path
 
 
 Access control path
 

-`-groups` `<string>` ::
+`--groups` `<string>` ::

 
 List of groups.
 
 
 List of groups.
 

-`-propagate` `<boolean>` ('default =' `1`)::
+`--propagate` `<boolean>` ('default =' `1`)::

 
 Allow to propagate (inherit) permissions.
 
 
 Allow to propagate (inherit) permissions.
 

-`-roles` `<string>` ::
+`--roles` `<string>` ::

 
 List of roles.
 
 
 List of roles.
 

-`-users` `<string>` ::
+`--users` `<string>` ::

 
 List of users.
 
 
 
 
 List of users.
 
 
 

-*pveum aclmod* `<path> -roles <string>` `[OPTIONS]`
+*pveum aclmod* `<path> --roles <string>` `[OPTIONS]`

 
 Update Access Control List (add or remove permissions).
 
 
 Update Access Control List (add or remove permissions).
 


@@ -34,19 +34,19 @@ Update Access Control List (add or remove permissions).
 
 Access control path
 
 
 Access control path
 

-`-groups` `<string>` ::
+`--groups` `<string>` ::

 
 List of groups.
 
 
 List of groups.
 

-`-propagate` `<boolean>` ('default =' `1`)::
+`--propagate` `<boolean>` ('default =' `1`)::

 
 Allow to propagate (inherit) permissions.
 
 
 Allow to propagate (inherit) permissions.
 

-`-roles` `<string>` ::
+`--roles` `<string>` ::

 
 List of roles.
 
 
 List of roles.
 

-`-users` `<string>` ::
+`--users` `<string>` ::

 
 List of users.
 
 
 List of users.
 


@@ -61,7 +61,7 @@ Create new group.
 
 no description available
 
 
 no description available
 

-`-comment` `<string>` ::
+`--comment` `<string>` ::

 
 no description available
 
 
 no description available
 


@@ -85,7 +85,7 @@ Update group data.
 
 no description available
 
 
 no description available
 

-`-comment` `<string>` ::
+`--comment` `<string>` ::

 
 no description available
 
 
 no description available
 


@@ -100,7 +100,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -126,7 +126,7 @@ Create new role.
 
 no description available
 
 
 no description available
 

-`-privs` `<string>` ::
+`--privs` `<string>` ::

 
 no description available
 
 
 no description available
 


@@ -142,7 +142,7 @@ no description available
 
 
 
 
 
 

-*pveum rolemod* `<roleid> -privs <string>` `[OPTIONS]`
+*pveum rolemod* `<roleid> --privs <string>` `[OPTIONS]`

 
 Create new role.
 
 
 Create new role.
 


@@ -150,13 +150,13 @@ Create new role.
 
 no description available
 
 
 no description available
 

-`-append` `<boolean>` ::
+`--append` `<boolean>` ::

 
 no description available
 +
 NOTE: Requires option(s): `privs`
 
 
 no description available
 +
 NOTE: Requires option(s): `privs`
 

-`-privs` `<string>` ::
+`--privs` `<string>` ::

 
 no description available
 
 
 no description available
 


@@ -171,23 +171,23 @@ Create or verify authentication ticket.
 
 User name
 
 
 User name
 

-`-otp` `<string>` ::
+`--otp` `<string>` ::

 
 One-time password for Two-factor authentication.
 
 
 One-time password for Two-factor authentication.
 

-`-path` `<string>` ::
+`--path` `<string>` ::

 
 Verify ticket, and check if user have access 'privs' on 'path'
 +
 NOTE: Requires option(s): `privs`
 
 
 Verify ticket, and check if user have access 'privs' on 'path'
 +
 NOTE: Requires option(s): `privs`
 

-`-privs` `<string>` ::
+`--privs` `<string>` ::

 
 Verify ticket, and check if user have access 'privs' on 'path'
 +
 NOTE: Requires option(s): `path`
 
 
 Verify ticket, and check if user have access 'privs' on 'path'
 +
 NOTE: Requires option(s): `path`
 

-`-realm` `<string>` ::
+`--realm` `<string>` ::

 
 You can optionally pass the realm using this parameter. Normally the realm is simply added to the username <username>@<relam>.
 
 
 You can optionally pass the realm using this parameter. Normally the realm is simply added to the username <username>@<relam>.
 


@@ -202,39 +202,39 @@ Create new user.
 
 User ID
 
 
 User ID
 

-`-comment` `<string>` ::
+`--comment` `<string>` ::

 
 no description available
 
 
 no description available
 

-`-email` `<string>` ::
+`--email` `<string>` ::

 
 no description available
 
 
 no description available
 

-`-enable` `<boolean>` ('default =' `1`)::
+`--enable` `<boolean>` ('default =' `1`)::

 
 Enable the account (default). You can set this to '0' to disable the accout
 
 
 Enable the account (default). You can set this to '0' to disable the accout
 

-`-expire` `<integer> (0 - N)` ::
+`--expire` `<integer> (0 - N)` ::

 
 Account expiration date (seconds since epoch). '0' means no expiration date.
 
 
 Account expiration date (seconds since epoch). '0' means no expiration date.
 

-`-firstname` `<string>` ::
+`--firstname` `<string>` ::

 
 no description available
 
 
 no description available
 

-`-groups` `<string>` ::
+`--groups` `<string>` ::

 
 no description available
 
 
 no description available
 

-`-keys` `<string>` ::
+`--keys` `<string>` ::

 
 Keys for two factor auth (yubico).
 
 
 Keys for two factor auth (yubico).
 

-`-lastname` `<string>` ::
+`--lastname` `<string>` ::

 
 no description available
 
 
 no description available
 

-`-password` ::
+`--password` ::

 
 Initial password.
 
 
 Initial password.
 


@@ -258,41 +258,41 @@ Update user configuration.
 
 User ID
 
 
 User ID
 

-`-append` `<boolean>` ::
+`--append` `<boolean>` ::

 
 no description available
 +
 NOTE: Requires option(s): `groups`
 
 
 no description available
 +
 NOTE: Requires option(s): `groups`
 

-`-comment` `<string>` ::
+`--comment` `<string>` ::

 
 no description available
 
 
 no description available
 

-`-email` `<string>` ::
+`--email` `<string>` ::

 
 no description available
 
 
 no description available
 

-`-enable` `<boolean>` ::
+`--enable` `<boolean>` ::

 
 Enable/disable the account.
 
 
 Enable/disable the account.
 

-`-expire` `<integer> (0 - N)` ::
+`--expire` `<integer> (0 - N)` ::

 
 Account expiration date (seconds since epoch). '0' means no expiration date.
 
 
 Account expiration date (seconds since epoch). '0' means no expiration date.
 

-`-firstname` `<string>` ::
+`--firstname` `<string>` ::

 
 no description available
 
 
 no description available
 

-`-groups` `<string>` ::
+`--groups` `<string>` ::

 
 no description available
 
 
 no description available
 

-`-keys` `<string>` ::
+`--keys` `<string>` ::

 
 Keys for two factor auth (yubico).
 
 
 Keys for two factor auth (yubico).
 

-`-lastname` `<string>` ::
+`--lastname` `<string>` ::

 
 no description available
 
 
 no description available
 

diff --git a/qm.1-synopsis.adoc b/qm.1-synopsis.adoc
index ff13c76bd05cacd7899a2fd52a43bfad7c738150..054436e45dbb91ac3a33162240954d25d20f5433 100644 (file)
--- a/qm.1-synopsis.adoc
+++ b/qm.1-synopsis.adoc
@@ -26,39 +26,39 @@ The (unique) ID of the VM.
 
 VMID for the clone.
 
 
 VMID for the clone.
 

-`-description` `<string>` ::
+`--description` `<string>` ::

 
 Description for the new VM.
 
 
 Description for the new VM.
 

-`-format` `<qcow2 | raw | vmdk>` ::
+`--format` `<qcow2 | raw | vmdk>` ::

 
 Target format for file storage.
 +
 NOTE: Requires option(s): `full`
 
 
 Target format for file storage.
 +
 NOTE: Requires option(s): `full`
 

-`-full` `<boolean>` ('default =' `0`)::
+`--full` `<boolean>` ('default =' `0`)::

 
 Create a full copy of all disk. This is always done when you clone a normal VM. For VM templates, we try to create a linked clone by default.
 
 
 Create a full copy of all disk. This is always done when you clone a normal VM. For VM templates, we try to create a linked clone by default.
 

-`-name` `<string>` ::
+`--name` `<string>` ::

 
 Set a name for the new VM.
 
 
 Set a name for the new VM.
 

-`-pool` `<string>` ::
+`--pool` `<string>` ::

 
 Add the new VM to the specified pool.
 
 
 Add the new VM to the specified pool.
 

-`-snapname` `<string>` ::
+`--snapname` `<string>` ::

 
 The name of the snapshot.
 
 
 The name of the snapshot.
 

-`-storage` `<string>` ::
+`--storage` `<string>` ::

 
 Target storage for full clone.
 +
 NOTE: Requires option(s): `full`
 
 
 Target storage for full clone.
 +
 NOTE: Requires option(s): `full`
 

-`-target` `<string>` ::
+`--target` `<string>` ::

 
 Target node. Only allowed if the original VM is on shared storage.
 
 
 Target node. Only allowed if the original VM is on shared storage.
 


@@ -73,7 +73,7 @@ configuration changes (see 'pending' API).
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-current` `<boolean>` ('default =' `0`)::
+`--current` `<boolean>` ('default =' `0`)::

 
 Get current values (instead of pending values).
 
 
 Get current values (instead of pending values).
 


@@ -87,251 +87,255 @@ Create or restore a virtual machine.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-acpi` `<boolean>` ('default =' `1`)::
+`--acpi` `<boolean>` ('default =' `1`)::

 
 Enable/disable ACPI.
 
 
 Enable/disable ACPI.
 

-`-agent` `<boolean>` ('default =' `0`)::
+`--agent` `<boolean>` ('default =' `0`)::

 
 Enable/disable Qemu GuestAgent.
 
 
 Enable/disable Qemu GuestAgent.
 

-`-archive` `<string>` ::
+`--archive` `<string>` ::

 
 The backup file.
 
 
 The backup file.
 

-`-args` `<string>` ::
+`--args` `<string>` ::

 
 Arbitrary arguments passed to kvm.
 
 
 Arbitrary arguments passed to kvm.
 

-`-autostart` `<boolean>` ('default =' `0`)::
+`--autostart` `<boolean>` ('default =' `0`)::

 
 Automatic restart after crash (currently ignored).
 
 
 Automatic restart after crash (currently ignored).
 

-`-balloon` `<integer> (0 - N)` ::
+`--balloon` `<integer> (0 - N)` ::

 
 Amount of target RAM for the VM in MB. Using zero disables the ballon driver.
 
 
 Amount of target RAM for the VM in MB. Using zero disables the ballon driver.
 

-`-bios` `<ovmf | seabios>` ('default =' `seabios`)::
+`--bios` `<ovmf | seabios>` ('default =' `seabios`)::

 
 Select BIOS implementation.
 
 
 Select BIOS implementation.
 

-`-boot` `[acdn]{1,4}` ('default =' `cdn`)::
+`--boot` `[acdn]{1,4}` ('default =' `cdn`)::

 
 Boot on floppy (a), hard disk (c), CD-ROM (d), or network (n).
 
 
 Boot on floppy (a), hard disk (c), CD-ROM (d), or network (n).
 

-`-bootdisk` `(ide|sata|scsi|virtio)\d+` ::
+`--bootdisk` `(ide|sata|scsi|virtio)\d+` ::

 
 Enable booting from specified disk.
 
 
 Enable booting from specified disk.
 

-`-cdrom` `<volume>` ::
+`--cdrom` `<volume>` ::

 
 This is an alias for option -ide2
 
 
 This is an alias for option -ide2
 

-`-cores` `<integer> (1 - N)` ('default =' `1`)::
+`--cores` `<integer> (1 - N)` ('default =' `1`)::

 
 The number of cores per socket.
 
 
 The number of cores per socket.
 

-`-cpu` `[cputype=]<enum> [,hidden=<1|0>]` ::
+`--cpu` `[cputype=]<enum> [,hidden=<1|0>]` ::

 
 Emulated CPU type.
 
 
 Emulated CPU type.
 

-`-cpulimit` `<number> (0 - 128)` ('default =' `0`)::
+`--cpulimit` `<number> (0 - 128)` ('default =' `0`)::

 
 Limit of CPU usage.
 
 
 Limit of CPU usage.
 

-`-cpuunits` `<integer> (0 - 500000)` ('default =' `1024`)::
+`--cpuunits` `<integer> (2 - 262144)` ('default =' `1024`)::

 
 CPU weight for a VM.
 
 
 CPU weight for a VM.
 

-`-description` `<string>` ::
+`--description` `<string>` ::

 
 Description for the VM. Only used on the configuration web interface. This is saved as comment inside the configuration file.
 
 
 Description for the VM. Only used on the configuration web interface. This is saved as comment inside the configuration file.
 

-`-efidisk0` `[file=]<volume> [,format=<enum>] [,size=<DiskSize>]` ::
+`--efidisk0` `[file=]<volume> [,format=<enum>] [,size=<DiskSize>]` ::

 
 Configure a Disk for storing EFI vars
 
 
 Configure a Disk for storing EFI vars
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Allow to overwrite existing VM.
 +
 NOTE: Requires option(s): `archive`
 
 
 Allow to overwrite existing VM.
 +
 NOTE: Requires option(s): `archive`
 

-`-freeze` `<boolean>` ::
+`--freeze` `<boolean>` ::

 
 Freeze CPU at startup (use 'c' monitor command to start execution).
 
 
 Freeze CPU at startup (use 'c' monitor command to start execution).
 

-`-hostpci[n]` `[host=]<HOSTPCIID[;HOSTPCIID2...]> [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]` ::
+`--hostpci[n]` `[host=]<HOSTPCIID[;HOSTPCIID2...]> [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]` ::

 
 Map host PCI devices into guest.
 
 
 Map host PCI devices into guest.
 

-`-hotplug` `<string>` ('default =' `network,disk,usb`)::
+`--hotplug` `<string>` ('default =' `network,disk,usb`)::

 
 Selectively enable hotplug features. This is a comma separated list of hotplug features: 'network', 'disk', 'cpu', 'memory' and 'usb'. Use '0' to disable hotplug completely. Value '1' is an alias for the default 'network,disk,usb'.
 
 
 Selectively enable hotplug features. This is a comma separated list of hotplug features: 'network', 'disk', 'cpu', 'memory' and 'usb'. Use '0' to disable hotplug completely. Value '1' is an alias for the default 'network,disk,usb'.
 

-`-hugepages` `<1024 | 2 | any>` ::
+`--hugepages` `<1024 | 2 | any>` ::

 
 Enable/disable hugepages memory.
 
 
 Enable/disable hugepages memory.
 

-`-ide[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,model=<model>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::
+`--ide[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,model=<model>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::

 
 Use volume as IDE hard disk or CD-ROM (n is 0 to 3).
 
 
 Use volume as IDE hard disk or CD-ROM (n is 0 to 3).
 

-`-keyboard` `<da | de | de-ch | en-gb | en-us | es | fi | fr | fr-be | fr-ca | fr-ch | hu | is | it | ja | lt | mk | nl | no | pl | pt | pt-br | sl | sv | tr>` ('default =' `en-us`)::
+`--keyboard` `<da | de | de-ch | en-gb | en-us | es | fi | fr | fr-be | fr-ca | fr-ch | hu | is | it | ja | lt | mk | nl | no | pl | pt | pt-br | sl | sv | tr>` ('default =' `en-us`)::

 
 Keybord layout for vnc server. Default is read from the '/etc/pve/datacenter.conf' configuration file.
 
 
 Keybord layout for vnc server. Default is read from the '/etc/pve/datacenter.conf' configuration file.
 

-`-kvm` `<boolean>` ('default =' `1`)::
+`--kvm` `<boolean>` ('default =' `1`)::

 
 Enable/disable KVM hardware virtualization.
 
 
 Enable/disable KVM hardware virtualization.
 

-`-localtime` `<boolean>` ::
+`--localtime` `<boolean>` ::

 
 Set the real time clock to local time. This is enabled by default if ostype indicates a Microsoft OS.
 
 
 Set the real time clock to local time. This is enabled by default if ostype indicates a Microsoft OS.
 

-`-lock` `<backup | migrate | rollback | snapshot>` ::
+`--lock` `<backup | migrate | rollback | snapshot>` ::

 
 Lock/unlock the VM.
 
 
 Lock/unlock the VM.
 

-`-machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?)` ::
+`--machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?)` ::

 
 Specific the Qemu machine type.
 
 
 Specific the Qemu machine type.
 

-`-memory` `<integer> (16 - N)` ('default =' `512`)::
+`--memory` `<integer> (16 - N)` ('default =' `512`)::

 
 Amount of RAM for the VM in MB. This is the maximum available memory when you use the balloon device.
 
 
 Amount of RAM for the VM in MB. This is the maximum available memory when you use the balloon device.
 

-`-migrate_downtime` `<number> (0 - N)` ('default =' `0.1`)::
+`--migrate_downtime` `<number> (0 - N)` ('default =' `0.1`)::

 
 Set maximum tolerated downtime (in seconds) for migrations.
 
 
 Set maximum tolerated downtime (in seconds) for migrations.
 

-`-migrate_speed` `<integer> (0 - N)` ('default =' `0`)::
+`--migrate_speed` `<integer> (0 - N)` ('default =' `0`)::

 
 Set maximum speed (in MB/s) for migrations. Value 0 is no limit.
 
 
 Set maximum speed (in MB/s) for migrations. Value 0 is no limit.
 

-`-name` `<string>` ::
+`--name` `<string>` ::

 
 Set a name for the VM. Only used on the configuration web interface.
 
 
 Set a name for the VM. Only used on the configuration web interface.
 

-`-net[n]` `[model=]<enum> [,bridge=<bridge>] [,firewall=<1|0>] [,link_down=<1|0>] [,macaddr=<XX:XX:XX:XX:XX:XX>] [,queues=<integer>] [,rate=<number>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,<model>=<macaddr>]` ::
+`--net[n]` `[model=]<enum> [,bridge=<bridge>] [,firewall=<1|0>] [,link_down=<1|0>] [,macaddr=<XX:XX:XX:XX:XX:XX>] [,queues=<integer>] [,rate=<number>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,<model>=<macaddr>]` ::

 
 Specify network devices.
 
 
 Specify network devices.
 

-`-numa` `<boolean>` ('default =' `0`)::
+`--numa` `<boolean>` ('default =' `0`)::

 
 Enable/disable NUMA.
 
 
 Enable/disable NUMA.
 

-`-numa[n]` `cpus=<id[-id];...> [,hostnodes=<id[-id];...>] [,memory=<number>] [,policy=<preferred|bind|interleave>]` ::
+`--numa[n]` `cpus=<id[-id];...> [,hostnodes=<id[-id];...>] [,memory=<number>] [,policy=<preferred|bind|interleave>]` ::

 
 NUMA topology.
 
 
 NUMA topology.
 

-`-onboot` `<boolean>` ('default =' `0`)::
+`--onboot` `<boolean>` ('default =' `0`)::

 
 Specifies whether a VM will be started during system bootup.
 
 
 Specifies whether a VM will be started during system bootup.
 

-`-ostype` `<l24 | l26 | other | solaris | w2k | w2k3 | w2k8 | win10 | win7 | win8 | wvista | wxp>` ::
+`--ostype` `<l24 | l26 | other | solaris | w2k | w2k3 | w2k8 | win10 | win7 | win8 | wvista | wxp>` ::

 
 Specify guest operating system.
 
 
 Specify guest operating system.
 

-`-parallel[n]` `/dev/parport\d+|/dev/usb/lp\d+` ::
+`--parallel[n]` `/dev/parport\d+|/dev/usb/lp\d+` ::

 
 Map host parallel devices (n is 0 to 2).
 
 
 Map host parallel devices (n is 0 to 2).
 

-`-pool` `<string>` ::
+`--pool` `<string>` ::

 
 Add the VM to the specified pool.
 
 
 Add the VM to the specified pool.
 

-`-protection` `<boolean>` ('default =' `0`)::
+`--protection` `<boolean>` ('default =' `0`)::

 
 Sets the protection flag of the VM. This will disable the remove VM and remove disk operations.
 
 
 Sets the protection flag of the VM. This will disable the remove VM and remove disk operations.
 

-`-reboot` `<boolean>` ('default =' `1`)::
+`--reboot` `<boolean>` ('default =' `1`)::

 
 Allow reboot. If set to '0' the VM exit on reboot.
 
 
 Allow reboot. If set to '0' the VM exit on reboot.
 

-`-sata[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::
+`--sata[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::

 
 Use volume as SATA hard disk or CD-ROM (n is 0 to 5).
 
 
 Use volume as SATA hard disk or CD-ROM (n is 0 to 5).
 

-`-scsi[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,queues=<integer>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,scsiblock=<1|0>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::
+`--scsi[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,queues=<integer>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,scsiblock=<1|0>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::

 
 Use volume as SCSI hard disk or CD-ROM (n is 0 to 13).
 
 
 Use volume as SCSI hard disk or CD-ROM (n is 0 to 13).
 

-`-scsihw` `<lsi | lsi53c810 | megasas | pvscsi | virtio-scsi-pci | virtio-scsi-single>` ('default =' `lsi`)::
+`--scsihw` `<lsi | lsi53c810 | megasas | pvscsi | virtio-scsi-pci | virtio-scsi-single>` ('default =' `lsi`)::

 
 SCSI controller model
 
 
 SCSI controller model
 

-`-serial[n]` `(/dev/.+|socket)` ::
+`--serial[n]` `(/dev/.+|socket)` ::

 
 Create a serial device inside the VM (n is 0 to 3)
 
 
 Create a serial device inside the VM (n is 0 to 3)
 

-`-shares` `<integer> (0 - 50000)` ('default =' `1000`)::
+`--shares` `<integer> (0 - 50000)` ('default =' `1000`)::

 
 Amount of memory shares for auto-ballooning. The larger the number is, the more memory this VM gets. Number is relative to weights of all other running VMs. Using zero disables auto-ballooning
 
 
 Amount of memory shares for auto-ballooning. The larger the number is, the more memory this VM gets. Number is relative to weights of all other running VMs. Using zero disables auto-ballooning
 

-`-smbios1` `[family=<string>] [,manufacturer=<string>] [,product=<string>] [,serial=<string>] [,sku=<string>] [,uuid=<UUID>] [,version=<string>]` ::
+`--smbios1` `[family=<string>] [,manufacturer=<string>] [,product=<string>] [,serial=<string>] [,sku=<string>] [,uuid=<UUID>] [,version=<string>]` ::

 
 Specify SMBIOS type 1 fields.
 
 
 Specify SMBIOS type 1 fields.
 

-`-smp` `<integer> (1 - N)` ('default =' `1`)::
+`--smp` `<integer> (1 - N)` ('default =' `1`)::

 
 The number of CPUs. Please use option -sockets instead.
 
 
 The number of CPUs. Please use option -sockets instead.
 

-`-sockets` `<integer> (1 - N)` ('default =' `1`)::
+`--sockets` `<integer> (1 - N)` ('default =' `1`)::

 
 The number of CPU sockets.
 
 
 The number of CPU sockets.
 

-`-startdate` `(now | YYYY-MM-DD | YYYY-MM-DDTHH:MM:SS)` ('default =' `now`)::
+`--startdate` `(now | YYYY-MM-DD | YYYY-MM-DDTHH:MM:SS)` ('default =' `now`)::

 
 Set the initial date of the real time clock. Valid format for date are: 'now' or '2006-06-17T16:01:21' or '2006-06-17'.
 
 
 Set the initial date of the real time clock. Valid format for date are: 'now' or '2006-06-17T16:01:21' or '2006-06-17'.
 

-`-startup` `[[order=]\d+] [,up=\d+] [,down=\d+] ` ::
+`--startup` `[[order=]\d+] [,up=\d+] [,down=\d+] ` ::

 
 Startup and shutdown behavior. Order is a non-negative number defining the general startup order. Shutdown in done with reverse ordering. Additionally you can set the 'up' or 'down' delay in seconds, which specifies a delay to wait before the next VM is started or stopped.
 
 
 Startup and shutdown behavior. Order is a non-negative number defining the general startup order. Shutdown in done with reverse ordering. Additionally you can set the 'up' or 'down' delay in seconds, which specifies a delay to wait before the next VM is started or stopped.
 

-`-storage` `<string>` ::
+`--storage` `<string>` ::

 
 Default storage.
 
 
 Default storage.
 

-`-tablet` `<boolean>` ('default =' `1`)::
+`--tablet` `<boolean>` ('default =' `1`)::

 
 Enable/disable the USB tablet device.
 
 
 Enable/disable the USB tablet device.
 

-`-tdf` `<boolean>` ('default =' `0`)::
+`--tdf` `<boolean>` ('default =' `0`)::

 
 Enable/disable time drift fix.
 
 
 Enable/disable time drift fix.
 

-`-template` `<boolean>` ('default =' `0`)::
+`--template` `<boolean>` ('default =' `0`)::

 
 Enable/disable Template.
 
 
 Enable/disable Template.
 

-`-unique` `<boolean>` ::
+`--unique` `<boolean>` ::

 
 Assign a unique random ethernet address.
 +
 NOTE: Requires option(s): `archive`
 
 
 Assign a unique random ethernet address.
 +
 NOTE: Requires option(s): `archive`
 

-`-unused[n]` `<string>` ::
+`--unused[n]` `<string>` ::

 
 Reference to unused volumes. This is used internally, and should not be modified manually.
 
 
 Reference to unused volumes. This is used internally, and should not be modified manually.
 

-`-usb[n]` `[host=]<HOSTUSBDEVICE|spice> [,usb3=<1|0>]` ::
+`--usb[n]` `[host=]<HOSTUSBDEVICE|spice> [,usb3=<1|0>]` ::

 
 Configure an USB device (n is 0 to 4).
 
 
 Configure an USB device (n is 0 to 4).
 

-`-vcpus` `<integer> (1 - N)` ('default =' `0`)::
+`--vcpus` `<integer> (1 - N)` ('default =' `0`)::

 
 Number of hotplugged vcpus.
 
 
 Number of hotplugged vcpus.
 

-`-vga` `<cirrus | qxl | qxl2 | qxl3 | qxl4 | serial0 | serial1 | serial2 | serial3 | std | vmware>` ::
+`--vga` `<cirrus | qxl | qxl2 | qxl3 | qxl4 | serial0 | serial1 | serial2 | serial3 | std | vmware>` ::

 
 Select the VGA type.
 
 
 Select the VGA type.
 

-`-virtio[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::
+`--virtio[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::

 
 Use volume as VIRTIO hard disk (n is 0 to 15).
 
 
 Use volume as VIRTIO hard disk (n is 0 to 15).
 

-`-watchdog` `[[model=]<i6300esb|ib700>] [,action=<enum>]` ::
+`--vmstatestorage` `<string>` ::
+
+Default storage for VM state volumes/files.
+
+`--watchdog` `[[model=]<i6300esb|ib700>] [,action=<enum>]` ::

 
 Create a virtual hardware watchdog device.
 
 
 Create a virtual hardware watchdog device.
 


@@ -349,7 +353,7 @@ The (unique) ID of the VM.
 
 The name of the snapshot.
 
 
 The name of the snapshot.
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 For removal from config file, even if removing disk snapshots fails.
 
 
 For removal from config file, even if removing disk snapshots fails.
 


@@ -363,7 +367,7 @@ Destroy the vm (also delete all used/owned volumes).
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 


@@ -378,7 +382,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -402,7 +406,33 @@ Path to the disk image to import
 
 Target storage ID
 
 
 Target storage ID
 

-`-format` `<qcow2 | raw | vmdk>` ::
+`--format` `<qcow2 | raw | vmdk>` ::
+
+Target format
+
+
+
+*qm importovf* `<vmid> <manifest> <storage>` `[OPTIONS]`
+
+Create a new VM using parameters read from an OVF manifest
+
+`<vmid>`: `<integer> (1 - N)` ::
+
+The (unique) ID of the VM.
+
+`<manifest>`: `<string>` ::
+
+path to the ovf file
+
+`<storage>`: `<string>` ::
+
+Target storage ID
+
+`--dryrun` `<boolean>` ::
+
+Print a parsed representation of the extracted OVF parameters, but do not create a VM
+
+`--format` `<qcow2 | raw | vmdk>` ::

 
 Target format
 
 
 Target format
 


@@ -413,7 +443,7 @@ Target format
 
 Virtual machine index (per node).
 
 
 Virtual machine index (per node).
 

-`-full` `<boolean>` ::
+`--full` `<boolean>` ::

 
 Determine the full status of active VMs.
 
 
 Determine the full status of active VMs.
 


@@ -441,27 +471,27 @@ The (unique) ID of the VM.
 
 Target node.
 
 
 Target node.
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Allow to migrate VMs which use local devices. Only root may use this option.
 
 
 Allow to migrate VMs which use local devices. Only root may use this option.
 

-`-migration_network` `<string>` ::
+`--migration_network` `<string>` ::

 
 CIDR of the (sub) network that is used for migration.
 
 
 CIDR of the (sub) network that is used for migration.
 

-`-migration_type` `<insecure | secure>` ::
+`--migration_type` `<insecure | secure>` ::

 
 Migration traffic is encrypted using an SSH tunnel by default. On secure, completely private networks this can be disabled to increase performance.
 
 
 Migration traffic is encrypted using an SSH tunnel by default. On secure, completely private networks this can be disabled to increase performance.
 

-`-online` `<boolean>` ::
+`--online` `<boolean>` ::

 
 Use online/live migration.
 
 
 Use online/live migration.
 

-`-targetstorage` `<string>` ::
+`--targetstorage` `<string>` ::

 
 Default target storage.
 
 
 Default target storage.
 

-`-with-local-disks` `<boolean>` ::
+`--with-local-disks` `<boolean>` ::

 
 Enable live storage migration for local disk
 
 
 Enable live storage migration for local disk
 


@@ -495,15 +525,15 @@ The disk you want to move.
 
 Target storage.
 
 
 Target storage.
 

-`-delete` `<boolean>` ('default =' `0`)::
+`--delete` `<boolean>` ('default =' `0`)::

 
 Delete the original disk after successful copy. By default the original disk is kept as unused disk.
 
 
 Delete the original disk after successful copy. By default the original disk is kept as unused disk.
 

-`-digest` `<string>` ::
+`--digest` `<string>` ::

 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 
 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 

-`-format` `<qcow2 | raw | vmdk>` ::
+`--format` `<qcow2 | raw | vmdk>` ::

 
 Target Format.
 
 
 Target Format.
 


@@ -542,7 +572,7 @@ The (unique) ID of the VM.
 
 Rescan all storages and update disk sizes and unused disk images.
 
 
 Rescan all storages and update disk sizes and unused disk images.
 

-`-vmid` `<integer> (1 - N)` ::
+`--vmid` `<integer> (1 - N)` ::

 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 


@@ -557,7 +587,7 @@ Reset virtual machine.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 


@@ -579,11 +609,11 @@ The disk you want to resize.
 
 The new size. With the `+` sign the value is added to the actual size of the volume and without it, the value is taken as an absolute one. Shrinking disk size is not supported.
 
 
 The new size. With the `+` sign the value is added to the actual size of the volume and without it, the value is taken as an absolute one. Shrinking disk size is not supported.
 

-`-digest` `<string>` ::
+`--digest` `<string>` ::

 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 
 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 


@@ -597,11 +627,11 @@ Resume virtual machine.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-nocheck` `<boolean>` ::
+`--nocheck` `<boolean>` ::

 
 no description available
 
 
 no description available
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 


@@ -633,7 +663,7 @@ The (unique) ID of the VM.
 
 The key (qemu monitor encoding).
 
 
 The key (qemu monitor encoding).
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 


@@ -649,249 +679,253 @@ allocation.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-acpi` `<boolean>` ('default =' `1`)::
+`--acpi` `<boolean>` ('default =' `1`)::

 
 Enable/disable ACPI.
 
 
 Enable/disable ACPI.
 

-`-agent` `<boolean>` ('default =' `0`)::
+`--agent` `<boolean>` ('default =' `0`)::

 
 Enable/disable Qemu GuestAgent.
 
 
 Enable/disable Qemu GuestAgent.
 

-`-args` `<string>` ::
+`--args` `<string>` ::

 
 Arbitrary arguments passed to kvm.
 
 
 Arbitrary arguments passed to kvm.
 

-`-autostart` `<boolean>` ('default =' `0`)::
+`--autostart` `<boolean>` ('default =' `0`)::

 
 Automatic restart after crash (currently ignored).
 
 
 Automatic restart after crash (currently ignored).
 

-`-balloon` `<integer> (0 - N)` ::
+`--balloon` `<integer> (0 - N)` ::

 
 Amount of target RAM for the VM in MB. Using zero disables the ballon driver.
 
 
 Amount of target RAM for the VM in MB. Using zero disables the ballon driver.
 

-`-bios` `<ovmf | seabios>` ('default =' `seabios`)::
+`--bios` `<ovmf | seabios>` ('default =' `seabios`)::

 
 Select BIOS implementation.
 
 
 Select BIOS implementation.
 

-`-boot` `[acdn]{1,4}` ('default =' `cdn`)::
+`--boot` `[acdn]{1,4}` ('default =' `cdn`)::

 
 Boot on floppy (a), hard disk (c), CD-ROM (d), or network (n).
 
 
 Boot on floppy (a), hard disk (c), CD-ROM (d), or network (n).
 

-`-bootdisk` `(ide|sata|scsi|virtio)\d+` ::
+`--bootdisk` `(ide|sata|scsi|virtio)\d+` ::

 
 Enable booting from specified disk.
 
 
 Enable booting from specified disk.
 

-`-cdrom` `<volume>` ::
+`--cdrom` `<volume>` ::

 
 This is an alias for option -ide2
 
 
 This is an alias for option -ide2
 

-`-cores` `<integer> (1 - N)` ('default =' `1`)::
+`--cores` `<integer> (1 - N)` ('default =' `1`)::

 
 The number of cores per socket.
 
 
 The number of cores per socket.
 

-`-cpu` `[cputype=]<enum> [,hidden=<1|0>]` ::
+`--cpu` `[cputype=]<enum> [,hidden=<1|0>]` ::

 
 Emulated CPU type.
 
 
 Emulated CPU type.
 

-`-cpulimit` `<number> (0 - 128)` ('default =' `0`)::
+`--cpulimit` `<number> (0 - 128)` ('default =' `0`)::

 
 Limit of CPU usage.
 
 
 Limit of CPU usage.
 

-`-cpuunits` `<integer> (0 - 500000)` ('default =' `1024`)::
+`--cpuunits` `<integer> (2 - 262144)` ('default =' `1024`)::

 
 CPU weight for a VM.
 
 
 CPU weight for a VM.
 

-`-delete` `<string>` ::
+`--delete` `<string>` ::

 
 A list of settings you want to delete.
 
 
 A list of settings you want to delete.
 

-`-description` `<string>` ::
+`--description` `<string>` ::

 
 Description for the VM. Only used on the configuration web interface. This is saved as comment inside the configuration file.
 
 
 Description for the VM. Only used on the configuration web interface. This is saved as comment inside the configuration file.
 

-`-digest` `<string>` ::
+`--digest` `<string>` ::

 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 
 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 

-`-efidisk0` `[file=]<volume> [,format=<enum>] [,size=<DiskSize>]` ::
+`--efidisk0` `[file=]<volume> [,format=<enum>] [,size=<DiskSize>]` ::

 
 Configure a Disk for storing EFI vars
 
 
 Configure a Disk for storing EFI vars
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Force physical removal. Without this, we simple remove the disk from the config file and create an additional configuration entry called 'unused[n]', which contains the volume ID. Unlink of unused[n] always cause physical removal.
 +
 NOTE: Requires option(s): `delete`
 
 
 Force physical removal. Without this, we simple remove the disk from the config file and create an additional configuration entry called 'unused[n]', which contains the volume ID. Unlink of unused[n] always cause physical removal.
 +
 NOTE: Requires option(s): `delete`
 

-`-freeze` `<boolean>` ::
+`--freeze` `<boolean>` ::

 
 Freeze CPU at startup (use 'c' monitor command to start execution).
 
 
 Freeze CPU at startup (use 'c' monitor command to start execution).
 

-`-hostpci[n]` `[host=]<HOSTPCIID[;HOSTPCIID2...]> [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]` ::
+`--hostpci[n]` `[host=]<HOSTPCIID[;HOSTPCIID2...]> [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]` ::

 
 Map host PCI devices into guest.
 
 
 Map host PCI devices into guest.
 

-`-hotplug` `<string>` ('default =' `network,disk,usb`)::
+`--hotplug` `<string>` ('default =' `network,disk,usb`)::

 
 Selectively enable hotplug features. This is a comma separated list of hotplug features: 'network', 'disk', 'cpu', 'memory' and 'usb'. Use '0' to disable hotplug completely. Value '1' is an alias for the default 'network,disk,usb'.
 
 
 Selectively enable hotplug features. This is a comma separated list of hotplug features: 'network', 'disk', 'cpu', 'memory' and 'usb'. Use '0' to disable hotplug completely. Value '1' is an alias for the default 'network,disk,usb'.
 

-`-hugepages` `<1024 | 2 | any>` ::
+`--hugepages` `<1024 | 2 | any>` ::

 
 Enable/disable hugepages memory.
 
 
 Enable/disable hugepages memory.
 

-`-ide[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,model=<model>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::
+`--ide[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,model=<model>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::

 
 Use volume as IDE hard disk or CD-ROM (n is 0 to 3).
 
 
 Use volume as IDE hard disk or CD-ROM (n is 0 to 3).
 

-`-keyboard` `<da | de | de-ch | en-gb | en-us | es | fi | fr | fr-be | fr-ca | fr-ch | hu | is | it | ja | lt | mk | nl | no | pl | pt | pt-br | sl | sv | tr>` ('default =' `en-us`)::
+`--keyboard` `<da | de | de-ch | en-gb | en-us | es | fi | fr | fr-be | fr-ca | fr-ch | hu | is | it | ja | lt | mk | nl | no | pl | pt | pt-br | sl | sv | tr>` ('default =' `en-us`)::

 
 Keybord layout for vnc server. Default is read from the '/etc/pve/datacenter.conf' configuration file.
 
 
 Keybord layout for vnc server. Default is read from the '/etc/pve/datacenter.conf' configuration file.
 

-`-kvm` `<boolean>` ('default =' `1`)::
+`--kvm` `<boolean>` ('default =' `1`)::

 
 Enable/disable KVM hardware virtualization.
 
 
 Enable/disable KVM hardware virtualization.
 

-`-localtime` `<boolean>` ::
+`--localtime` `<boolean>` ::

 
 Set the real time clock to local time. This is enabled by default if ostype indicates a Microsoft OS.
 
 
 Set the real time clock to local time. This is enabled by default if ostype indicates a Microsoft OS.
 

-`-lock` `<backup | migrate | rollback | snapshot>` ::
+`--lock` `<backup | migrate | rollback | snapshot>` ::

 
 Lock/unlock the VM.
 
 
 Lock/unlock the VM.
 

-`-machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?)` ::
+`--machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?)` ::

 
 Specific the Qemu machine type.
 
 
 Specific the Qemu machine type.
 

-`-memory` `<integer> (16 - N)` ('default =' `512`)::
+`--memory` `<integer> (16 - N)` ('default =' `512`)::

 
 Amount of RAM for the VM in MB. This is the maximum available memory when you use the balloon device.
 
 
 Amount of RAM for the VM in MB. This is the maximum available memory when you use the balloon device.
 

-`-migrate_downtime` `<number> (0 - N)` ('default =' `0.1`)::
+`--migrate_downtime` `<number> (0 - N)` ('default =' `0.1`)::

 
 Set maximum tolerated downtime (in seconds) for migrations.
 
 
 Set maximum tolerated downtime (in seconds) for migrations.
 

-`-migrate_speed` `<integer> (0 - N)` ('default =' `0`)::
+`--migrate_speed` `<integer> (0 - N)` ('default =' `0`)::

 
 Set maximum speed (in MB/s) for migrations. Value 0 is no limit.
 
 
 Set maximum speed (in MB/s) for migrations. Value 0 is no limit.
 

-`-name` `<string>` ::
+`--name` `<string>` ::

 
 Set a name for the VM. Only used on the configuration web interface.
 
 
 Set a name for the VM. Only used on the configuration web interface.
 

-`-net[n]` `[model=]<enum> [,bridge=<bridge>] [,firewall=<1|0>] [,link_down=<1|0>] [,macaddr=<XX:XX:XX:XX:XX:XX>] [,queues=<integer>] [,rate=<number>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,<model>=<macaddr>]` ::
+`--net[n]` `[model=]<enum> [,bridge=<bridge>] [,firewall=<1|0>] [,link_down=<1|0>] [,macaddr=<XX:XX:XX:XX:XX:XX>] [,queues=<integer>] [,rate=<number>] [,tag=<integer>] [,trunks=<vlanid[;vlanid...]>] [,<model>=<macaddr>]` ::

 
 Specify network devices.
 
 
 Specify network devices.
 

-`-numa` `<boolean>` ('default =' `0`)::
+`--numa` `<boolean>` ('default =' `0`)::

 
 Enable/disable NUMA.
 
 
 Enable/disable NUMA.
 

-`-numa[n]` `cpus=<id[-id];...> [,hostnodes=<id[-id];...>] [,memory=<number>] [,policy=<preferred|bind|interleave>]` ::
+`--numa[n]` `cpus=<id[-id];...> [,hostnodes=<id[-id];...>] [,memory=<number>] [,policy=<preferred|bind|interleave>]` ::

 
 NUMA topology.
 
 
 NUMA topology.
 

-`-onboot` `<boolean>` ('default =' `0`)::
+`--onboot` `<boolean>` ('default =' `0`)::

 
 Specifies whether a VM will be started during system bootup.
 
 
 Specifies whether a VM will be started during system bootup.
 

-`-ostype` `<l24 | l26 | other | solaris | w2k | w2k3 | w2k8 | win10 | win7 | win8 | wvista | wxp>` ::
+`--ostype` `<l24 | l26 | other | solaris | w2k | w2k3 | w2k8 | win10 | win7 | win8 | wvista | wxp>` ::

 
 Specify guest operating system.
 
 
 Specify guest operating system.
 

-`-parallel[n]` `/dev/parport\d+|/dev/usb/lp\d+` ::
+`--parallel[n]` `/dev/parport\d+|/dev/usb/lp\d+` ::

 
 Map host parallel devices (n is 0 to 2).
 
 
 Map host parallel devices (n is 0 to 2).
 

-`-protection` `<boolean>` ('default =' `0`)::
+`--protection` `<boolean>` ('default =' `0`)::

 
 Sets the protection flag of the VM. This will disable the remove VM and remove disk operations.
 
 
 Sets the protection flag of the VM. This will disable the remove VM and remove disk operations.
 

-`-reboot` `<boolean>` ('default =' `1`)::
+`--reboot` `<boolean>` ('default =' `1`)::

 
 Allow reboot. If set to '0' the VM exit on reboot.
 
 
 Allow reboot. If set to '0' the VM exit on reboot.
 

-`-revert` `<string>` ::
+`--revert` `<string>` ::

 
 Revert a pending change.
 
 
 Revert a pending change.
 

-`-sata[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::
+`--sata[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::

 
 Use volume as SATA hard disk or CD-ROM (n is 0 to 5).
 
 
 Use volume as SATA hard disk or CD-ROM (n is 0 to 5).
 

-`-scsi[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,queues=<integer>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,scsiblock=<1|0>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::
+`--scsi[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,queues=<integer>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,scsiblock=<1|0>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::

 
 Use volume as SCSI hard disk or CD-ROM (n is 0 to 13).
 
 
 Use volume as SCSI hard disk or CD-ROM (n is 0 to 13).
 

-`-scsihw` `<lsi | lsi53c810 | megasas | pvscsi | virtio-scsi-pci | virtio-scsi-single>` ('default =' `lsi`)::
+`--scsihw` `<lsi | lsi53c810 | megasas | pvscsi | virtio-scsi-pci | virtio-scsi-single>` ('default =' `lsi`)::

 
 SCSI controller model
 
 
 SCSI controller model
 

-`-serial[n]` `(/dev/.+|socket)` ::
+`--serial[n]` `(/dev/.+|socket)` ::

 
 Create a serial device inside the VM (n is 0 to 3)
 
 
 Create a serial device inside the VM (n is 0 to 3)
 

-`-shares` `<integer> (0 - 50000)` ('default =' `1000`)::
+`--shares` `<integer> (0 - 50000)` ('default =' `1000`)::

 
 Amount of memory shares for auto-ballooning. The larger the number is, the more memory this VM gets. Number is relative to weights of all other running VMs. Using zero disables auto-ballooning
 
 
 Amount of memory shares for auto-ballooning. The larger the number is, the more memory this VM gets. Number is relative to weights of all other running VMs. Using zero disables auto-ballooning
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 

-`-smbios1` `[family=<string>] [,manufacturer=<string>] [,product=<string>] [,serial=<string>] [,sku=<string>] [,uuid=<UUID>] [,version=<string>]` ::
+`--smbios1` `[family=<string>] [,manufacturer=<string>] [,product=<string>] [,serial=<string>] [,sku=<string>] [,uuid=<UUID>] [,version=<string>]` ::

 
 Specify SMBIOS type 1 fields.
 
 
 Specify SMBIOS type 1 fields.
 

-`-smp` `<integer> (1 - N)` ('default =' `1`)::
+`--smp` `<integer> (1 - N)` ('default =' `1`)::

 
 The number of CPUs. Please use option -sockets instead.
 
 
 The number of CPUs. Please use option -sockets instead.
 

-`-sockets` `<integer> (1 - N)` ('default =' `1`)::
+`--sockets` `<integer> (1 - N)` ('default =' `1`)::

 
 The number of CPU sockets.
 
 
 The number of CPU sockets.
 

-`-startdate` `(now | YYYY-MM-DD | YYYY-MM-DDTHH:MM:SS)` ('default =' `now`)::
+`--startdate` `(now | YYYY-MM-DD | YYYY-MM-DDTHH:MM:SS)` ('default =' `now`)::

 
 Set the initial date of the real time clock. Valid format for date are: 'now' or '2006-06-17T16:01:21' or '2006-06-17'.
 
 
 Set the initial date of the real time clock. Valid format for date are: 'now' or '2006-06-17T16:01:21' or '2006-06-17'.
 

-`-startup` `[[order=]\d+] [,up=\d+] [,down=\d+] ` ::
+`--startup` `[[order=]\d+] [,up=\d+] [,down=\d+] ` ::

 
 Startup and shutdown behavior. Order is a non-negative number defining the general startup order. Shutdown in done with reverse ordering. Additionally you can set the 'up' or 'down' delay in seconds, which specifies a delay to wait before the next VM is started or stopped.
 
 
 Startup and shutdown behavior. Order is a non-negative number defining the general startup order. Shutdown in done with reverse ordering. Additionally you can set the 'up' or 'down' delay in seconds, which specifies a delay to wait before the next VM is started or stopped.
 

-`-tablet` `<boolean>` ('default =' `1`)::
+`--tablet` `<boolean>` ('default =' `1`)::

 
 Enable/disable the USB tablet device.
 
 
 Enable/disable the USB tablet device.
 

-`-tdf` `<boolean>` ('default =' `0`)::
+`--tdf` `<boolean>` ('default =' `0`)::

 
 Enable/disable time drift fix.
 
 
 Enable/disable time drift fix.
 

-`-template` `<boolean>` ('default =' `0`)::
+`--template` `<boolean>` ('default =' `0`)::

 
 Enable/disable Template.
 
 
 Enable/disable Template.
 

-`-unused[n]` `<string>` ::
+`--unused[n]` `<string>` ::

 
 Reference to unused volumes. This is used internally, and should not be modified manually.
 
 
 Reference to unused volumes. This is used internally, and should not be modified manually.
 

-`-usb[n]` `[host=]<HOSTUSBDEVICE|spice> [,usb3=<1|0>]` ::
+`--usb[n]` `[host=]<HOSTUSBDEVICE|spice> [,usb3=<1|0>]` ::

 
 Configure an USB device (n is 0 to 4).
 
 
 Configure an USB device (n is 0 to 4).
 

-`-vcpus` `<integer> (1 - N)` ('default =' `0`)::
+`--vcpus` `<integer> (1 - N)` ('default =' `0`)::

 
 Number of hotplugged vcpus.
 
 
 Number of hotplugged vcpus.
 

-`-vga` `<cirrus | qxl | qxl2 | qxl3 | qxl4 | serial0 | serial1 | serial2 | serial3 | std | vmware>` ::
+`--vga` `<cirrus | qxl | qxl2 | qxl3 | qxl4 | serial0 | serial1 | serial2 | serial3 | std | vmware>` ::

 
 Select the VGA type.
 
 
 Select the VGA type.
 

-`-virtio[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::
+`--virtio[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::

 
 Use volume as VIRTIO hard disk (n is 0 to 15).
 
 
 Use volume as VIRTIO hard disk (n is 0 to 15).
 

-`-watchdog` `[[model=]<i6300esb|ib700>] [,action=<enum>]` ::
+`--vmstatestorage` `<string>` ::
+
+Default storage for VM state volumes/files.
+
+`--watchdog` `[[model=]<i6300esb|ib700>] [,action=<enum>]` ::

 
 Create a virtual hardware watchdog device.
 
 
 Create a virtual hardware watchdog device.
 


@@ -919,19 +953,19 @@ should then proceed to a clean shutdown.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-forceStop` `<boolean>` ('default =' `0`)::
+`--forceStop` `<boolean>` ('default =' `0`)::

 
 Make sure the VM stops.
 
 
 Make sure the VM stops.
 

-`-keepActive` `<boolean>` ('default =' `0`)::
+`--keepActive` `<boolean>` ('default =' `0`)::

 
 Do not deactivate storage volumes.
 
 
 Do not deactivate storage volumes.
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 

-`-timeout` `<integer> (0 - N)` ::
+`--timeout` `<integer> (0 - N)` ::

 
 Wait maximal timeout seconds.
 
 
 Wait maximal timeout seconds.
 


@@ -949,11 +983,11 @@ The (unique) ID of the VM.
 
 The name of the snapshot.
 
 
 The name of the snapshot.
 

-`-description` `<string>` ::
+`--description` `<string>` ::

 
 A textual description or comment.
 
 
 A textual description or comment.
 

-`-vmstate` `<boolean>` ::
+`--vmstate` `<boolean>` ::

 
 Save the vmstate
 
 
 Save the vmstate
 


@@ -967,31 +1001,31 @@ Start virtual machine.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?)` ::
+`--machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?)` ::

 
 Specific the Qemu machine type.
 
 
 Specific the Qemu machine type.
 

-`-migratedfrom` `<string>` ::
+`--migratedfrom` `<string>` ::

 
 The cluster node name.
 
 
 The cluster node name.
 

-`-migration_network` `<string>` ::
+`--migration_network` `<string>` ::

 
 CIDR of the (sub) network that is used for migration.
 
 
 CIDR of the (sub) network that is used for migration.
 

-`-migration_type` `<insecure | secure>` ::
+`--migration_type` `<insecure | secure>` ::

 
 Migration traffic is encrypted using an SSH tunnel by default. On secure, completely private networks this can be disabled to increase performance.
 
 
 Migration traffic is encrypted using an SSH tunnel by default. On secure, completely private networks this can be disabled to increase performance.
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 

-`-stateuri` `<string>` ::
+`--stateuri` `<string>` ::

 
 Some command save/restore state from this location.
 
 
 Some command save/restore state from this location.
 

-`-targetstorage` `<string>` ::
+`--targetstorage` `<string>` ::

 
 Target storage for the migration. (Can be '1' to use the same storage id as on the source node.)
 
 
 Target storage for the migration. (Can be '1' to use the same storage id as on the source node.)
 


@@ -1006,7 +1040,7 @@ Show VM status.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format
 
 
 Verbose output format
 


@@ -1022,19 +1056,19 @@ to pulling the power plug of a running computer and may damage the VM data
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-keepActive` `<boolean>` ('default =' `0`)::
+`--keepActive` `<boolean>` ('default =' `0`)::

 
 Do not deactivate storage volumes.
 
 
 Do not deactivate storage volumes.
 

-`-migratedfrom` `<string>` ::
+`--migratedfrom` `<string>` ::

 
 The cluster node name.
 
 
 The cluster node name.
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 

-`-timeout` `<integer> (0 - N)` ::
+`--timeout` `<integer> (0 - N)` ::

 
 Wait maximal timeout seconds.
 
 
 Wait maximal timeout seconds.
 


@@ -1048,7 +1082,7 @@ Suspend virtual machine.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-skiplock` `<boolean>` ::
+`--skiplock` `<boolean>` ::

 
 Ignore locks - only root is allowed to use this option.
 
 
 Ignore locks - only root is allowed to use this option.
 


@@ -1062,7 +1096,7 @@ Create a Template.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-disk` `<efidisk0 | ide0 | ide1 | ide2 | ide3 | sata0 | sata1 | sata2 | sata3 | sata4 | sata5 | scsi0 | scsi1 | scsi10 | scsi11 | scsi12 | scsi13 | scsi2 | scsi3 | scsi4 | scsi5 | scsi6 | scsi7 | scsi8 | scsi9 | virtio0 | virtio1 | virtio10 | virtio11 | virtio12 | virtio13 | virtio14 | virtio15 | virtio2 | virtio3 | virtio4 | virtio5 | virtio6 | virtio7 | virtio8 | virtio9>` ::
+`--disk` `<efidisk0 | ide0 | ide1 | ide2 | ide3 | sata0 | sata1 | sata2 | sata3 | sata4 | sata5 | scsi0 | scsi1 | scsi10 | scsi11 | scsi12 | scsi13 | scsi2 | scsi3 | scsi4 | scsi5 | scsi6 | scsi7 | scsi8 | scsi9 | virtio0 | virtio1 | virtio10 | virtio11 | virtio12 | virtio13 | virtio14 | virtio15 | virtio2 | virtio3 | virtio4 | virtio5 | virtio6 | virtio7 | virtio8 | virtio9>` ::

 
 If you want to convert only 1 disk to base image.
 
 
 If you want to convert only 1 disk to base image.
 


@@ -1078,14 +1112,14 @@ configured, for example 'serial0: socket')
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-iface` `<serial0 | serial1 | serial2 | serial3>` ::
+`--iface` `<serial0 | serial1 | serial2 | serial3>` ::

 
 Select the serial device. By default we simply use the first suitable device.
 
 
 
 
 
 Select the serial device. By default we simply use the first suitable device.
 
 
 
 

-*qm unlink* `<vmid> -idlist <string>` `[OPTIONS]`
+*qm unlink* `<vmid> --idlist <string>` `[OPTIONS]`

 
 Unlink/delete disk images.
 
 
 Unlink/delete disk images.
 


@@ -1093,11 +1127,11 @@ Unlink/delete disk images.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Force physical removal. Without this, we simple remove the disk from the config file and create an additional configuration entry called 'unused[n]', which contains the volume ID. Unlink of unused[n] always cause physical removal.
 
 
 Force physical removal. Without this, we simple remove the disk from the config file and create an additional configuration entry called 'unused[n]', which contains the volume ID. Unlink of unused[n] always cause physical removal.
 

-`-idlist` `<string>` ::
+`--idlist` `<string>` ::

 
 A list of disk IDs you want to delete.
 
 
 A list of disk IDs you want to delete.
 


@@ -1132,7 +1166,7 @@ Wait until the VM is stopped.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-timeout` `<integer> (1 - N)` ::
+`--timeout` `<integer> (1 - N)` ::

 
 Timeout in seconds. Default is to wait forever.
 
 
 Timeout in seconds. Default is to wait forever.
 

diff --git a/qm.conf.5-opts.adoc b/qm.conf.5-opts.adoc
index 65cccb68de02116b42505ad00c83da0927b5f8de..77c912c926c1371623142014fbcc329d62d48f9a 100644 (file)
--- a/qm.conf.5-opts.adoc
+++ b/qm.conf.5-opts.adoc
@@ -60,11 +60,9 @@ Limit of CPU usage.
 +
 NOTE: If the computer has 2 CPUs, it has total of '2' CPU time. Value '0' indicates no CPU limit.
 
 +
 NOTE: If the computer has 2 CPUs, it has total of '2' CPU time. Value '0' indicates no CPU limit.
 

-`cpuunits`: `<integer> (0 - 500000)` ('default =' `1024`)::
+`cpuunits`: `<integer> (2 - 262144)` ('default =' `1024`)::

 
 CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to weights of all the other running VMs.
 
 CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to weights of all the other running VMs.

-+
-NOTE: You can disable fair-scheduler configuration by setting this to 0.

 
 `description`: `<string>` ::
 
 
 `description`: `<string>` ::
 


@@ -1055,6 +1053,10 @@ Force disk geometry bios translation mode.
 
 Write error action.
 
 
 Write error action.
 

+`vmstatestorage`: `<string>` ::
+
+Default storage for VM state volumes/files.
+

 `watchdog`: `[[model=]<i6300esb|ib700>] [,action=<enum>]` ::
 
 Create a virtual hardware watchdog device. Once enabled (by a guest action), the watchdog must be periodically polled by an agent inside the guest or else the watchdog will reset the guest (or execute the respective action specified)
 `watchdog`: `[[model=]<i6300esb|ib700>] [,action=<enum>]` ::
 
 Create a virtual hardware watchdog device. Once enabled (by a guest action), the watchdog must be periodically polled by an agent inside the guest or else the watchdog will reset the guest (or execute the respective action specified)

diff --git a/qmrestore.1-synopsis.adoc b/qmrestore.1-synopsis.adoc
index 1cafb41dd1c53fd05601ff393addc1a0ca7dcfc1..425c01a19d22e141fe93285096d2ff76da5a1987 100644 (file)
--- a/qmrestore.1-synopsis.adoc
+++ b/qmrestore.1-synopsis.adoc
@@ -12,19 +12,19 @@ The backup file. You can pass '-' to read from standard input.
 
 The (unique) ID of the VM.
 
 
 The (unique) ID of the VM.
 

-`-force` `<boolean>` ::
+`--force` `<boolean>` ::

 
 Allow to overwrite existing VM.
 
 
 Allow to overwrite existing VM.
 

-`-pool` `<string>` ::
+`--pool` `<string>` ::

 
 Add the VM to the specified pool.
 
 
 Add the VM to the specified pool.
 

-`-storage` `<string>` ::
+`--storage` `<string>` ::

 
 Default storage.
 
 
 Default storage.
 

-`-unique` `<boolean>` ::
+`--unique` `<boolean>` ::

 
 Assign a unique random ethernet address.
 
 
 Assign a unique random ethernet address.
 

diff --git a/spiceproxy.8-synopsis.adoc b/spiceproxy.8-synopsis.adoc
index 9078619583b90b529eaa4d63ca917fec43833a02..a62ccd7970f23e22903c880d50bb092819f6c57c 100644 (file)
--- a/spiceproxy.8-synopsis.adoc
+++ b/spiceproxy.8-synopsis.adoc
@@ -8,7 +8,7 @@ Get help about specified command.
 
 Command name
 
 
 Command name
 

-`-verbose` `<boolean>` ::
+`--verbose` `<boolean>` ::

 
 Verbose output format.
 
 
 Verbose output format.
 


@@ -25,7 +25,7 @@ Restart the daemon (or start if not running).
 
 Start the daemon.
 
 
 Start the daemon.
 

-`-debug` `<boolean>` ('default =' `0`)::
+`--debug` `<boolean>` ('default =' `0`)::

 
 Debug mode - stay in foreground
 
 
 Debug mode - stay in foreground
 

diff --git a/vzdump.1-synopsis.adoc b/vzdump.1-synopsis.adoc
index 39600b27b5e194af2cf3fc339ce5eb81caca8dcb..87642b13e40e2f5e1fc0e8194016cb4c3c729a04 100644 (file)
--- a/vzdump.1-synopsis.adoc
+++ b/vzdump.1-synopsis.adoc
@@ -8,99 +8,99 @@ Create backup.
 
 The ID of the guest system you want to backup.
 
 
 The ID of the guest system you want to backup.
 

-`-all` `<boolean>` ('default =' `0`)::
+`--all` `<boolean>` ('default =' `0`)::

 
 Backup all known guest systems on this host.
 
 
 Backup all known guest systems on this host.
 

-`-bwlimit` `<integer> (0 - N)` ('default =' `0`)::
+`--bwlimit` `<integer> (0 - N)` ('default =' `0`)::

 
 Limit I/O bandwidth (KBytes per second).
 
 
 Limit I/O bandwidth (KBytes per second).
 

-`-compress` `<0 | 1 | gzip | lzo>` ('default =' `0`)::
+`--compress` `<0 | 1 | gzip | lzo>` ('default =' `0`)::

 
 Compress dump file.
 
 
 Compress dump file.
 

-`-dumpdir` `<string>` ::
+`--dumpdir` `<string>` ::

 
 Store resulting files to specified directory.
 
 
 Store resulting files to specified directory.
 

-`-exclude` `<string>` ::
+`--exclude` `<string>` ::

 
 Exclude specified guest systems (assumes --all)
 
 
 Exclude specified guest systems (assumes --all)
 

-`-exclude-path` `<string>` ::
+`--exclude-path` `<string>` ::

 
 Exclude certain files/directories (shell globs).
 
 
 Exclude certain files/directories (shell globs).
 

-`-ionice` `<integer> (0 - 8)` ('default =' `7`)::
+`--ionice` `<integer> (0 - 8)` ('default =' `7`)::

 
 Set CFQ ionice priority.
 
 
 Set CFQ ionice priority.
 

-`-lockwait` `<integer> (0 - N)` ('default =' `180`)::
+`--lockwait` `<integer> (0 - N)` ('default =' `180`)::

 
 Maximal time to wait for the global lock (minutes).
 
 
 Maximal time to wait for the global lock (minutes).
 

-`-mailnotification` `<always | failure>` ('default =' `always`)::
+`--mailnotification` `<always | failure>` ('default =' `always`)::

 
 Specify when to send an email
 
 
 Specify when to send an email
 

-`-mailto` `<string>` ::
+`--mailto` `<string>` ::

 
 Comma-separated list of email addresses that should receive email notifications.
 
 
 Comma-separated list of email addresses that should receive email notifications.
 

-`-maxfiles` `<integer> (1 - N)` ('default =' `1`)::
+`--maxfiles` `<integer> (1 - N)` ('default =' `1`)::

 
 Maximal number of backup files per guest system.
 
 
 Maximal number of backup files per guest system.
 

-`-mode` `<snapshot | stop | suspend>` ('default =' `snapshot`)::
+`--mode` `<snapshot | stop | suspend>` ('default =' `snapshot`)::

 
 Backup mode.
 
 
 Backup mode.
 

-`-node` `<string>` ::
+`--node` `<string>` ::

 
 Only run if executed on this node.
 
 
 Only run if executed on this node.
 

-`-pigz` `<integer>` ('default =' `0`)::
+`--pigz` `<integer>` ('default =' `0`)::

 
 Use pigz instead of gzip when N>0. N=1 uses half of cores, N>1 uses N as thread count.
 
 
 Use pigz instead of gzip when N>0. N=1 uses half of cores, N>1 uses N as thread count.
 

-`-quiet` `<boolean>` ('default =' `0`)::
+`--quiet` `<boolean>` ('default =' `0`)::

 
 Be quiet.
 
 
 Be quiet.
 

-`-remove` `<boolean>` ('default =' `1`)::
+`--remove` `<boolean>` ('default =' `1`)::

 
 Remove old backup files if there are more than 'maxfiles' backup files.
 
 
 Remove old backup files if there are more than 'maxfiles' backup files.
 

-`-script` `<string>` ::
+`--script` `<string>` ::

 
 Use specified hook script.
 
 
 Use specified hook script.
 

-`-size` `<integer> (500 - N)` ('default =' `1024`)::
+`--size` `<integer> (500 - N)` ('default =' `1024`)::

 
 Unused, will be removed in a future release.
 
 
 Unused, will be removed in a future release.
 

-`-stdexcludes` `<boolean>` ('default =' `1`)::
+`--stdexcludes` `<boolean>` ('default =' `1`)::

 
 Exclude temporary files and logs.
 
 
 Exclude temporary files and logs.
 

-`-stdout` `<boolean>` ::
+`--stdout` `<boolean>` ::

 
 Write tar to stdout, not to a file.
 
 
 Write tar to stdout, not to a file.
 

-`-stop` `<boolean>` ('default =' `0`)::
+`--stop` `<boolean>` ('default =' `0`)::

 
 Stop runnig backup jobs on this host.
 
 
 Stop runnig backup jobs on this host.
 

-`-stopwait` `<integer> (0 - N)` ('default =' `10`)::
+`--stopwait` `<integer> (0 - N)` ('default =' `10`)::

 
 Maximal time to wait until a guest system is stopped (minutes).
 
 
 Maximal time to wait until a guest system is stopped (minutes).
 

-`-storage` `<string>` ::
+`--storage` `<string>` ::

 
 Store resulting file to this storage.
 
 
 Store resulting file to this storage.
 

-`-tmpdir` `<string>` ::
+`--tmpdir` `<string>` ::

 
 Store temporary files to specified directory.
 
 
 Store temporary files to specified directory.