From: peter_wang <peter.wang13@emc.com>
Date: Fri, 13 Mar 2015 06:27:17 +0000 (-0400)
Subject: Fix ArgsAlreadyParsedError in emc_vnx_cli.py
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c39ea7fb6b40e0095afabd90dcc63924e875f329;p=openstack-build%2Fcinder-build.git

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 d423a7669..b4526f315 100644
--- 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',