Thanks jungleboy.
I had filed that bug so I can cleanup EQL driver LOG messages.
This is to submit changes I made for eqlx.py when we were at f2f meeting.
Still fighting configuration so I can run git review -s.
Here are the changes:
diff --git a/cinder/volume/drivers/eqlx.py b/cinder/volume/drivers/eqlx.py
index f7fbf16..5c638c6 100644
--- a/cinder/volume/drivers/eqlx.py
+++ b/cinder/volume/drivers/eqlx.py
@@ -37,26 +37,26 @@ LOG = logging.getLogger(__name__)
eqlx_opts = [
cfg.StrOpt('eqlx_group_name', default='group-0',
- help='Group name to use for creating volumes'),
+ help='Group name to use for creating volumes.'),
cfg.IntOpt('eqlx_cli_timeout', default=30,
- help='Timeout for the Group Manager cli command execution'),
+ help='Timeout for the Group Manager cli command execution.'),
cfg.IntOpt('eqlx_cli_max_retries', default=5,
- help='Maximum retry count for reconnection'),
+ help='Maximum retry count for reconnection.'),
cfg.BoolOpt('eqlx_use_chap', default=False, help='Use CHAP authentication for targets?'),
cfg.StrOpt('eqlx_chap_login', default='admin',
- help='Existing CHAP account name'),
+ help='Existing CHAP account name.'),
cfg.StrOpt('eqlx_chap_password', default='password',
- help='Password for specified CHAP account name',
+ help='Password for specified CHAP account name.', secret=True),
cfg.StrOpt('eqlx_pool', default='default',
- help='Pool in which volumes will be created')
+ help='Pool in which volumes will be created.')
]
@@ -157,11 +157,11 @@ class DellEQLSanISCSIDriver(SanISCSIDriver): self._get_output(chan)
Thanks jungleboy.
I had filed that bug so I can cleanup EQL driver LOG messages.
This is to submit changes I made for eqlx.py when we were at f2f meeting.
Still fighting configuration so I can run git review -s.
Here are the changes: volume/ drivers/ eqlx.py b/cinder/ volume/ drivers/ eqlx.py volume/ drivers/ eqlx.py volume/ drivers/ eqlx.py getLogger( __name_ _) StrOpt( 'eqlx_group_ name',
default= 'group- 0', IntOpt( 'eqlx_cli_ timeout' ,
default= 30, IntOpt( 'eqlx_cli_ max_retries' ,
default= 5, BoolOpt( 'eqlx_use_ chap',
default= False,
help= 'Use CHAP authentication for targets?'), StrOpt( 'eqlx_chap_ login',
default= 'admin' , StrOpt( 'eqlx_chap_ password' ,
default= 'password' ,
secret= True), StrOpt( 'eqlx_pool' ,
default= 'default' ,
diff --git a/cinder/
index f7fbf16..5c638c6 100644
--- a/cinder/
+++ b/cinder/
@@ -37,26 +37,26 @@ LOG = logging.
eqlx_opts = [
cfg.
- help='Group name to use for creating volumes'),
+ help='Group name to use for creating volumes.'),
cfg.
- help='Timeout for the Group Manager cli command execution'),
+ help='Timeout for the Group Manager cli command execution.'),
cfg.
- help='Maximum retry count for reconnection'),
+ help='Maximum retry count for reconnection.'),
cfg.
cfg.
- help='Existing CHAP account name'),
+ help='Existing CHAP account name.'),
cfg.
- help='Password for specified CHAP account name',
+ help='Password for specified CHAP account name.',
cfg.
- help='Pool in which volumes will be created')
+ help='Pool in which volumes will be created.')
]
@@ -157,11 +157,11 @@ class DellEQLSanISCSI Driver( SanISCSIDriver) :
self. _get_output( chan)
cmd = 'stty columns 255'
chan. send(cmd + '\r') output( chan)
- LOG.debug("Setting CLI terminal width: '%s'", cmd)
+ LOG.debug("Setting CLI terminal width: '%s'.", cmd)
out = self._get_
- LOG.debug("Sending CLI command: '%s'", command)
chan. send(command + '\r') output( chan)
+ LOG.debug("Sending CLI command: '%s'.", command)
out = self._get_
@@ -199,7 +199,7 @@ class DellEQLSanISCSI Driver( SanISCSIDriver) :
while attempts > 0:
attempts -= 1
try: