Merge "Add clearer help kwarg for max_volumes_per_user"

This commit is contained in:
Jenkins
2014-02-17 06:36:56 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 1 deletions

View File

@@ -54,8 +54,10 @@ trove_volume_support = True
block_device_mapping = vdb
device_path = /dev/vdb
mount_point = /var/lib/mysql
# Maximum volume size for an instance
max_accepted_volume_size = 10
max_instances_per_user = 5
# Maximum volume capacity (in GB) spanning across all trove volumes per tenant
max_volumes_per_user = 100
max_backups_per_user = 5
volume_time_out=30

View File

@@ -105,7 +105,8 @@ common_opts = [
cfg.IntOpt('max_accepted_volume_size', default=5,
help='Default maximum volume size for an instance.'),
cfg.IntOpt('max_volumes_per_user', default=20,
help='Default maximum for total volume used by a tenant.'),
help='Default maximum volume capacity (in GB) spanning across '
'all trove volumes per tenant'),
cfg.IntOpt('max_backups_per_user', default=50,
help='Default maximum number of backups created by a tenant.'),
cfg.StrOpt('quota_driver',