Merge "Remove deprecated HPE Lefthand config opts"

This commit is contained in:
Zuul 2018-10-30 18:08:43 +00:00 committed by Gerrit Code Review
commit c8140899c9
2 changed files with 16 additions and 12 deletions

View File

@ -69,30 +69,24 @@ hpelefthand_opts = [
cfg.URIOpt('hpelefthand_api_url', cfg.URIOpt('hpelefthand_api_url',
default=None, default=None,
help="HPE LeftHand WSAPI Server Url like " help="HPE LeftHand WSAPI Server Url like "
"https://<LeftHand ip>:8081/lhos", "https://<LeftHand ip>:8081/lhos"),
deprecated_name='hplefthand_api_url'),
cfg.StrOpt('hpelefthand_username', cfg.StrOpt('hpelefthand_username',
default=None, default=None,
help="HPE LeftHand Super user username", help="HPE LeftHand Super user username"),
deprecated_name='hplefthand_username'),
cfg.StrOpt('hpelefthand_password', cfg.StrOpt('hpelefthand_password',
default=None, default=None,
help="HPE LeftHand Super user password", help="HPE LeftHand Super user password",
secret=True, secret=True),
deprecated_name='hplefthand_password'),
cfg.StrOpt('hpelefthand_clustername', cfg.StrOpt('hpelefthand_clustername',
default=None, default=None,
help="HPE LeftHand cluster name", help="HPE LeftHand cluster name"),
deprecated_name='hplefthand_clustername'),
cfg.BoolOpt('hpelefthand_iscsi_chap_enabled', cfg.BoolOpt('hpelefthand_iscsi_chap_enabled',
default=False, default=False,
help='Configure CHAP authentication for iSCSI connections ' help='Configure CHAP authentication for iSCSI connections '
'(Default: Disabled)', '(Default: Disabled)'),
deprecated_name='hplefthand_iscsi_chap_enabled'),
cfg.BoolOpt('hpelefthand_debug', cfg.BoolOpt('hpelefthand_debug',
default=False, default=False,
help="Enable HTTP debugging to LeftHand", help="Enable HTTP debugging to LeftHand"),
deprecated_name='hplefthand_debug'),
cfg.PortOpt('hpelefthand_ssh_port', cfg.PortOpt('hpelefthand_ssh_port',
default=16022, default=16022,
help="Port number of SSH service."), help="Port number of SSH service."),

View File

@ -0,0 +1,10 @@
---
upgrade:
- |
HPE LeftHand config options ``hplefthand_api_url``, ``hplefthand_username``,
``hplefthand_password``, ``hplefthand_clustername``,
``hplefthand_iscsi_chap_enabled``, and ``hplefthand_debug`` were deprecated
in the Mitaka release and have now been removed. The corresponding
``hpelefthand_api_url``, ``hpelefthand_username``, ``hpelefthand_password``,
``hpelefthand_clustername``, ``hpelefthand_iscsi_chap_enabled``, and
``hpelefthand_debug`` should be used instead.