summaryrefslogtreecommitdiff
path: root/cinder/opts.py
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-27 17:09:39 +0000
committerGerrit Code Review <review@openstack.org>2019-06-27 17:09:39 +0000
commitddb78a99286ae7963f4b8ee1d2e5fc1b54a0a4c3 (patch)
treede09b6302130e4f59275a6b863f627a0e8dd1289 /cinder/opts.py
parent42b2e0fc6d6e6885de4c7e9652b344ac42a14909 (diff)
parent0eaca453bc1e8a45d8883d95080d0cab01dadcd7 (diff)
downloadcinder-ddb78a99286ae7963f4b8ee1d2e5fc1b54a0a4c3.tar.gz
Merge "rename ScaleIO driver to VxFlex OS"
Diffstat (limited to 'cinder/opts.py')
-rw-r--r--cinder/opts.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cinder/opts.py b/cinder/opts.py
index ecd09df85..4a2ff85bd 100644
--- a/cinder/opts.py
+++ b/cinder/opts.py
@@ -79,12 +79,12 @@ from cinder.volume.drivers.dell_emc import ps as \
cinder_volume_drivers_dell_emc_ps
from cinder.volume.drivers.dell_emc.sc import storagecenter_common as \
cinder_volume_drivers_dell_emc_sc_storagecentercommon
-from cinder.volume.drivers.dell_emc.scaleio import driver as \
- cinder_volume_drivers_dell_emc_scaleio_driver
from cinder.volume.drivers.dell_emc.unity import driver as \
cinder_volume_drivers_dell_emc_unity_driver
from cinder.volume.drivers.dell_emc.vnx import common as \
cinder_volume_drivers_dell_emc_vnx_common
+from cinder.volume.drivers.dell_emc.vxflexos import driver as \
+ cinder_volume_drivers_dell_emc_vxflexos_driver
from cinder.volume.drivers.dell_emc import xtremio as \
cinder_volume_drivers_dell_emc_xtremio
from cinder.volume.drivers.fujitsu.eternus_dx import eternus_dx_common as \
@@ -290,9 +290,9 @@ def list_opts():
cinder_volume_drivers_dell_emc_ps.eqlx_opts,
cinder_volume_drivers_dell_emc_sc_storagecentercommon.
common_opts,
- cinder_volume_drivers_dell_emc_scaleio_driver.scaleio_opts,
cinder_volume_drivers_dell_emc_unity_driver.UNITY_OPTS,
cinder_volume_drivers_dell_emc_vnx_common.VNX_OPTS,
+ cinder_volume_drivers_dell_emc_vxflexos_driver.vxflexos_opts,
cinder_volume_drivers_dell_emc_xtremio.XTREMIO_OPTS,
cinder_volume_drivers_fujitsu_eternus_dx_eternusdxcommon.
FJ_ETERNUS_DX_OPT_opts,