Merge "Make ipmi lanplus the default in auto fencing" into stable/queens

This commit is contained in:
Zuul 2019-08-12 23:23:48 +00:00 committed by Gerrit Code Review
commit f7badfea52
3 changed files with 14 additions and 2 deletions

View File

@ -0,0 +1,6 @@
---
features:
- |
Deprecate --ipmi-lanplus for ``openstack overcloud generate fencing``
command since now this is the default and add new option --ipmi-no-lanplus
to override it.

View File

@ -166,7 +166,7 @@ class TestGenerateFencingParameters(utils.TestCommand):
'delay': None, 'delay': None,
'os_auth': {}, 'os_auth': {},
'ipmi_cipher': None, 'ipmi_cipher': None,
'ipmi_lanplus': False, 'ipmi_lanplus': True,
'ipmi_level': None 'ipmi_level': None
}, },
run_sync=True, save_result=True) run_sync=True, save_result=True)

View File

@ -80,8 +80,14 @@ class GenerateFencingParameters(command.Command):
help=_('Wait DELAY seconds before fencing is ' help=_('Wait DELAY seconds before fencing is '
'started')) 'started'))
parser.add_argument('--ipmi-lanplus', parser.add_argument('--ipmi-lanplus',
dest='ipmi_lanplus',
default=True,
action='store_true', action='store_true',
help=_('Use Lanplus. Defaults to: false')) help=_('DEPRECATED: This is the default.'))
parser.add_argument('--ipmi-no-lanplus',
dest='ipmi_lanplus',
action='store_false',
help=_('Do not use Lanplus. Defaults to: false'))
parser.add_argument('--ipmi-cipher', type=int, parser.add_argument('--ipmi-cipher', type=int,
help=_('Ciphersuite to use (same as ipmitool -C ' help=_('Ciphersuite to use (same as ipmitool -C '
'parameter.')) 'parameter.'))