summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-16 18:54:13 +0000
committerGerrit Code Review <review@openstack.org>2018-11-16 18:54:14 +0000
commit708cf7eeed4f59db5656f4a8f42c496818bc40d8 (patch)
tree51a3d8361a136edf7ad0738999ffc9f811db8613
parentf10835e9c2deec393197b1f8477a70f2015a5914 (diff)
parentff3857b563c05c92d073f8c6529dcfd4e7f7957d (diff)
Merge "VMAX manila - deprecate old tags correctly"HEADmaster
-rw-r--r--manila/share/drivers/dell_emc/plugins/vmax/connection.py7
-rw-r--r--releasenotes/notes/vmax-rename-options-44d8123d14a23f94.yaml10
2 files changed, 15 insertions, 2 deletions
diff --git a/manila/share/drivers/dell_emc/plugins/vmax/connection.py b/manila/share/drivers/dell_emc/plugins/vmax/connection.py
index 9bbcd32..11bd1ed 100644
--- a/manila/share/drivers/dell_emc/plugins/vmax/connection.py
+++ b/manila/share/drivers/dell_emc/plugins/vmax/connection.py
@@ -44,11 +44,14 @@ LOG = log.getLogger(__name__)
44 44
45VMAX_OPTS = [ 45VMAX_OPTS = [
46 cfg.StrOpt('vmax_server_container', 46 cfg.StrOpt('vmax_server_container',
47 deprecated_name='emc_nas_server_container',
47 help='Data mover to host the NAS server.'), 48 help='Data mover to host the NAS server.'),
48 cfg.ListOpt('vmax_share_data_pools', 49 cfg.ListOpt('vmax_share_data_pools',
50 deprecated_name='emc_nas_pool_names',
49 help='Comma separated list of pools that can be used to ' 51 help='Comma separated list of pools that can be used to '
50 'persist share data.'), 52 'persist share data.'),
51 cfg.ListOpt('vmax_ethernet_ports', 53 cfg.ListOpt('vmax_ethernet_ports',
54 deprecated_name='emc_interface_ports',
52 help='Comma separated list of ports that can be used for ' 55 help='Comma separated list of ports that can be used for '
53 'share server interfaces. Members of the list ' 56 'share server interfaces. Members of the list '
54 'can be Unix-style glob expressions.') 57 'can be Unix-style glob expressions.')
@@ -584,7 +587,7 @@ class VMAXStorageConnection(driver.StorageConnection):
584 self.reserved_percentage = 0 587 self.reserved_percentage = 0
585 588
586 self.manager = manager.StorageObjectManager(config) 589 self.manager = manager.StorageObjectManager(config)
587 self.port_conf = config.safe_get('emc_interface_ports') 590 self.port_conf = config.safe_get('vmax_ethernet_ports')
588 591
589 def get_managed_ports(self): 592 def get_managed_ports(self):
590 # Get the real ports(devices) list from the backend storage 593 # Get the real ports(devices) list from the backend storage
@@ -600,7 +603,7 @@ class VMAXStorageConnection(driver.StorageConnection):
600 603
601 if not matched_ports: 604 if not matched_ports:
602 msg = (_("None of the specified network ports exist. " 605 msg = (_("None of the specified network ports exist. "
603 "Please check your configuration emc_interface_ports " 606 "Please check your configuration vmax_ethernet_ports "
604 "in manila.conf. The available ports on the Data Mover " 607 "in manila.conf. The available ports on the Data Mover "
605 "are %s.") % 608 "are %s.") %
606 ",".join(real_ports)) 609 ",".join(real_ports))
diff --git a/releasenotes/notes/vmax-rename-options-44d8123d14a23f94.yaml b/releasenotes/notes/vmax-rename-options-44d8123d14a23f94.yaml
new file mode 100644
index 0000000..204bd5e
--- /dev/null
+++ b/releasenotes/notes/vmax-rename-options-44d8123d14a23f94.yaml
@@ -0,0 +1,10 @@
1---
2upgrade:
3 - For Dell EMC VMAX Manila driver, replaced
4 emc_nas_pool_names with vmax_share_data_pools,
5 emc_interface_ports with vmax_ethernet_ports,
6 emc_nas_server_container with vmax_server_container.
7deprecations:
8 - For Dell EMC VMAX Manila driver, options emc_nas_pool_names,
9 emc_interface_ports, emc_nas_server_container are
10 deprecated.