qm: add overrule-shutdown to CLI usage examples

[pve-docs.git] / qm-cloud-init-opts.adoc

diff --git a/qm-cloud-init-opts.adoc b/qm-cloud-init-opts.adoc
index 2fa17351703363cf90d99447f794a60d804b3dd5..8e0e920cd9a5f8757e514bda6af15cbcf92933d9 100644 (file)
--- a/qm-cloud-init-opts.adoc
+++ b/qm-cloud-init-opts.adoc
@@ -1,27 +1,36 @@
-`cicustom`: `[meta=<volume>] [,network=<volume>] [,user=<volume>]` ::
+`cicustom`: `[meta=<volume>] [,network=<volume>] [,user=<volume>] [,vendor=<volume>]` ::

 
 Specify custom files to replace the automatically generated ones at start.
 
 `meta`=`<volume>` ;;
 
 
 Specify custom files to replace the automatically generated ones at start.
 
 `meta`=`<volume>` ;;
 

-Specify a custom file containing all meta data passed to the VM via cloud-init. This is provider specific meaning configdrive2 and nocloud differ.
+Specify a custom file containing all meta data passed to the VM via"
+           ." cloud-init. This is provider specific meaning configdrive2 and nocloud differ.

 
 `network`=`<volume>` ;;
 
 
 `network`=`<volume>` ;;
 

-Specify a custom file containing all network data passed to the VM via cloud-init.
+To pass a custom file containing all network data to the VM via cloud-init.

 
 `user`=`<volume>` ;;
 
 
 `user`=`<volume>` ;;
 

-Specify a custom file containing all user data passed to the VM via cloud-init.
+To pass a custom file containing all user data to the VM via cloud-init.
+
+`vendor`=`<volume>` ;;
+
+To pass a custom file containing all vendor data to the VM via cloud-init.

 
 `cipassword`: `<string>` ::
 
 Password to assign the user. Using this is generally not recommended. Use ssh keys instead. Also note that older cloud-init versions do not support hashed passwords.
 
 
 `cipassword`: `<string>` ::
 
 Password to assign the user. Using this is generally not recommended. Use ssh keys instead. Also note that older cloud-init versions do not support hashed passwords.
 

-`citype`: `<configdrive2 | nocloud>` ::
+`citype`: `<configdrive2 | nocloud | opennebula>` ::

 
 Specifies the cloud-init configuration format. The default depends on the configured operating system type (`ostype`. We use the `nocloud` format for Linux, and `configdrive2` for windows.
 
 
 Specifies the cloud-init configuration format. The default depends on the configured operating system type (`ostype`. We use the `nocloud` format for Linux, and `configdrive2` for windows.
 

+`ciupgrade`: `<boolean>` ('default =' `1`)::
+
+do an automatic package upgrade after the first boot.
+

 `ciuser`: `<string>` ::
 
 User name to change ssh keys and password for instead of the image's configured default user.
 `ciuser`: `<string>` ::
 
 User name to change ssh keys and password for instead of the image's configured default user.


@@ -32,9 +41,13 @@ Specify IP addresses and gateways for the corresponding interface.
 +
 IP addresses use CIDR notation, gateways are optional but need an IP of the same type specified.
 +
 +
 IP addresses use CIDR notation, gateways are optional but need an IP of the same type specified.
 +

-The special string 'dhcp' can be used for IP addresses to use DHCP, in which case no explicit gateway should be provided.
+The special string 'dhcp' can be used for IP addresses to use DHCP, in which case no explicit
+gateway should be provided.
+For IPv6 the special string 'auto' can be used to use stateless autoconfiguration. This requires
+cloud-init 19.4 or newer.

 +
 +

-If cloud-init is enabled and neither an IPv4 nor an IPv6 address is specified, it defaults to using dhcp on IPv4.
+If cloud-init is enabled and neither an IPv4 nor an IPv6 address is specified, it defaults to using
+dhcp on IPv4.

 
 `gw`=`<GatewayIPv4>` ;;
 
 
 `gw`=`<GatewayIPv4>` ;;