summaryrefslogtreecommitdiff
path: root/ironic/drivers/modules/irmc/common.py
diff options
context:
space:
mode:
authorLin Tan <lin.tan@intel.com>2015-12-22 15:02:14 +0800
committerLin Tan <lin.tan@intel.com>2016-03-04 09:53:38 +0800
commit6babbee68219d751c23189f981487b5d611af50d (patch)
tree5e87bd1ffeac36c48a7571a28fcc1a65eb34b0f4 /ironic/drivers/modules/irmc/common.py
parentc4a24947ef6397596920e84f50e5b1efc2288a5f (diff)
downloadironic-6babbee68219d751c23189f981487b5d611af50d.tar.gz
Remove duplicate doc in ironic.conf.sample
In the configuration sample file, the possible choices for some configuration options is described twice. Once via `# Possible values:` and the other as part of the help description. This will remove the duplication in the help. Change-Id: Ifaba17ea9029aa99db3ddffa9b7750c05b47460c
Diffstat (limited to 'ironic/drivers/modules/irmc/common.py')
-rw-r--r--ironic/drivers/modules/irmc/common.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/ironic/drivers/modules/irmc/common.py b/ironic/drivers/modules/irmc/common.py
index 646045b81..252a6a24a 100644
--- a/ironic/drivers/modules/irmc/common.py
+++ b/ironic/drivers/modules/irmc/common.py
@@ -29,25 +29,23 @@ opts = [
cfg.PortOpt('port',
default=443,
choices=[443, 80],
- help=_('Port to be used for iRMC operations, either 80 or '
- '443')),
+ help=_('Port to be used for iRMC operations')),
cfg.StrOpt('auth_method',
default='basic',
choices=['basic', 'digest'],
- help=_('Authentication method to be used for iRMC operations, '
- 'either "basic" or "digest"')),
+ help=_('Authentication method to be used for iRMC '
+ 'operations')),
cfg.IntOpt('client_timeout',
default=60,
help=_('Timeout (in seconds) for iRMC operations')),
cfg.StrOpt('sensor_method',
default='ipmitool',
choices=['ipmitool', 'scci'],
- help=_('Sensor data retrieval method, either '
- '"ipmitool" or "scci"')),
+ help=_('Sensor data retrieval method.')),
cfg.StrOpt('snmp_version',
default='v2c',
choices=['v1', 'v2c', 'v3'],
- help=_('SNMP protocol version, either "v1", "v2c" or "v3"')),
+ help=_('SNMP protocol version')),
cfg.PortOpt('snmp_port',
default=161,
help=_('SNMP port')),