diff --git a/source/adminguide/backup_and_recovery.rst b/source/adminguide/backup_and_recovery.rst index 90d0fd362f..2fc82d19da 100644 --- a/source/adminguide/backup_and_recovery.rst +++ b/source/adminguide/backup_and_recovery.rst @@ -98,7 +98,7 @@ Supported APIs: - **listBackupProviders**: lists available backup provider plugins - **listBackupProviderOfferings**: lists external backup policy/offering from a provider -- **importBackupProviderOfferings**: allows importing of an external backup policy/offering to CloudStack as a backup offering +- **importBackupOffering**: allows importing of an external backup policy/offering to CloudStack as a backup offering - **listBackupOfferings**: lists CloudStack's backup offerings (searching via keyword, and pagination supported) - **deleteBackupOffering**: deletes a backup offering by its ID @@ -168,10 +168,10 @@ Supported APIs: - **listBackupSchedule**: returns backup schedule of an Instance if defined. - **deleteBackupSchedule**: deletes backup schedule of an Instance. - **createBackup**: creates an adhoc backup for an Instance. -- **deleteVMBackup**: deletes an Instance backup (not support for per restore point for Veeam). +- **deleteBackup**: deletes an Instance backup (not support for per restore point for Veeam). - **listBackups**: lists backups. - **restoreBackup**: restore a previous Instance backup in-place of a stopped or destroyed Instance. -- **restoreVolumeFromBackup**: restore and attach a backed-up volume (of an Instance backup) to a specified Instance. +- **restoreVolumeFromBackupAndAttachToVM**: restore and attach a backed-up volume (of an Instance backup) to a specified Instance. .. |B&R-assignOffering.png| image:: /_static/images/B&R-assignOffering.png diff --git a/source/adminguide/veeam_plugin.rst b/source/adminguide/veeam_plugin.rst index f0d2091b56..8afb80c26d 100644 --- a/source/adminguide/veeam_plugin.rst +++ b/source/adminguide/veeam_plugin.rst @@ -47,7 +47,7 @@ There are a couple of important concepts to understand before working with the V Installing Veeam Backup and Recovery for use with CloudStack ------------------------------------------------------------- -The B&R Veeam plugin has been tested against Veeam Backup and Recovery 9.5 update 4b (Enterprise version). The +The B&R Veeam plugin has been tested against Veeam Backup and Recovery 11 and 12. The enterprise edition is required for the Enterprise Manager API. The final tested version of Veeam was on a Windows Server 2019 (with desktop), although much of the development work was done against a Windows Server 2016 OS (with desktop). @@ -58,7 +58,7 @@ and Replication, however please read the steps below carefully to ensure that yo compatibility with the B&R Veeam plug-in. -#. Install Backup and Replication 9.5 Manager - inc console - default settings +#. Install Backup and Replication Manager - inc console - default settings #. Install Enterprise manager #. Install an SSH server on the 'Veeam Backup and Replication Manager' server. Windows Server 2019 has 'OpenSSH Server' as a builtin optional feature which is compatible. @@ -126,15 +126,18 @@ Plug-in specific settings: .. cssclass:: table-striped table-bordered table-hover -==================================== ======================== -Configuration Description -==================================== ======================== -backup.plugin.veeam.url Veeam B&R server URL. Default: http://:9398/api/ -backup.plugin.veeam.username Veeam B&R server username. Default: administrator -backup.plugin.veeam.password Veeam B&R server password. Default: -backup.plugin.veeam.validate.ssl Whether to validate Veeam B&R server (SSL/TLS) connection while making API requests. Default: false -backup.plugin.veeam.request.timeout Veeam B&R API request timeout in seconds. Default: 300 -==================================== ======================== +======================================= ======================== +Configuration Description +======================================= ======================== +backup.plugin.veeam.url Veeam B&R server URL. Default: http://:9398/api/ +backup.plugin.veeam.version Veeam B&R server version. CloudStack will get Veeam server version via PowerShell commands if it is 0 or not set +backup.plugin.veeam.username Veeam B&R server username. Default: administrator +backup.plugin.veeam.password Veeam B&R server password. Default: +backup.plugin.veeam.validate.ssl Whether to validate Veeam B&R server (SSL/TLS) connection while making API requests. Default: false +backup.plugin.veeam.request.timeout Veeam B&R API request timeout in seconds. Default: 300 +backup.plugin.veeam.task.poll.interval The time interval in seconds when the management server polls for Veeam task status. Default: 5 +backup.plugin.veeam.task.poll.max.retry The max number of retrying times when the management server polls for Veeam task status. Default: 120 +======================================= ======================== .. |BnR-DummyTagCategory.jpg| image:: /_static/images/BnR-DummyTagCategory.jpg