Fix ArgsAlreadyParsedError in emc_vnx_cli.py

This error was introduced after adding following:
logging.register_options(CONF)
in https://review.openstack.org/#/c/157441/
So, this patchset is to remove this.

Change-Id: I3d7d30fb8a5d8f5424811fc7422efc2546300a12
Closes-Bug: 1431875

diff --git a/cinder/volume/drivers/emc/emc_vnx_cli.py b/cinder/volume/drivers/emc/emc_vnx_cli.py
index d423a76692850234bdf54d26683a0f4683174870..b4526f315e2d6c08ceb5ae289ff94d7047b0f5cb 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vnx_cli.py
+++ b/cinder/volume/drivers/emc/emc_vnx_cli.py
@@ -48,7 +48,6 @@ from cinder.volume import volume_types
 
 CONF = cfg.CONF
 
-logging.register_options(CONF)
 LOG = logging.getLogger(__name__)
 
 
@@ -1585,7 +1584,7 @@ class CommandLineHelper(object):
 class EMCVnxCliBase(object):
     """This class defines the functions to use the native CLI functionality."""
 
-    VERSION = '05.03.01'
+    VERSION = '05.03.02'
     stats = {'driver_version': VERSION,
              'storage_protocol': None,
              'vendor_name': 'EMC',