diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-10 06:11:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-10 06:11:52 +0000 |
| commit | 7011fbd69e7e2df81905c8e5517ea54cd25d167c (patch) | |
| tree | d477f98230006af7fec876537332ccfdcf9e4c8d | |
| parent | 65b85bfdb718f57265e43325da313dcef9abda97 (diff) | |
| parent | e9cc0c1d57303e28bb76933ca75e7a8e3fa6182d (diff) | |
| download | glance_store-7011fbd69e7e2df81905c8e5517ea54cd25d167c.tar.gz | |
Merge "Deprecate VMware store single datastore options"
| -rw-r--r-- | glance_store/_drivers/vmware_datastore.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/glance_store/_drivers/vmware_datastore.py b/glance_store/_drivers/vmware_datastore.py index 22e7093..f58edb7 100644 --- a/glance_store/_drivers/vmware_datastore.py +++ b/glance_store/_drivers/vmware_datastore.py @@ -66,12 +66,19 @@ _VMWARE_OPTS = [ secret=True), cfg.StrOpt('vmware_datacenter_path', default=constants.ESX_DATACENTER_PATH, - help=_('Inventory path to a datacenter. ' + help=_('DEPRECATED. Inventory path to a datacenter. ' 'If the vmware_server_host specified is an ESX/ESXi, ' 'the vmware_datacenter_path is optional. If specified, ' - 'it should be "ha-datacenter".')), + 'it should be "ha-datacenter". This option is ' + 'deprecated in favor of vmware_datastores and will be ' + 'removed in the Liberty release.'), + deprecated_for_removal=True), cfg.StrOpt('vmware_datastore_name', - help=_('Datastore associated with the datacenter.')), + help=_('DEPRECATED. Datastore associated with the datacenter. ' + 'This option is deprecated in favor of ' + 'vmware_datastores and will be removed in the Liberty ' + 'release.'), + deprecated_for_removal=True), cfg.IntOpt('vmware_api_retry_count', default=10, help=_('Number of times VMware ESX/VC server API must be ' |