openstack/ironic
Code Issues Proposed changes

Merge "Fix unit tests for oslo.config 4.0"

Browse Source
This commit is contained in:
Jenkins 2017-04-21 00:27:52 +00:00 committed by Gerrit Code Review
commit 72655e374d
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/ironic/ironic.conf.sample
View File

@ -243,7 +243,7 @@
# have storage_interface field set. A complete list of storage # have storage_interface field set. A complete list of storage
# interfaces present on your system may be found by # interfaces present on your system may be found by
# enumerating the "ironic.hardware.interfaces.storage" # enumerating the "ironic.hardware.interfaces.storage"
# entrypoint. (list value) # entrypoint. (string value)
#default_storage_interface = <None> #default_storage_interface = <None>
# Specify the list of vendor interfaces to load during service # Specify the list of vendor interfaces to load during service
@ -2564,10 +2564,20 @@
# value) # value)
#sasl_config_name = #sasl_config_name =
# User name for message broker authentication (string value) # DEPRECATED: User name for message broker authentication
# (string value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
# Reason: Should use configuration option transport_url to
# provide the username.
#username = #username =
# Password for message broker authentication (string value) # DEPRECATED: Password for message broker authentication
# (string value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
# Reason: Should use configuration option transport_url to
# provide the password.
#password = #password =
# Seconds to pause before attempting to re-connect. (integer # Seconds to pause before attempting to re-connect. (integer

4
ironic/conf/default.py
View File

@ -137,8 +137,8 @@ driver_opts = [
cfg.ListOpt('enabled_storage_interfaces', cfg.ListOpt('enabled_storage_interfaces',
default=['noop'], default=['noop'],
help=_ENABLED_IFACE_HELP.format('storage')), help=_ENABLED_IFACE_HELP.format('storage')),
cfg.ListOpt('default_storage_interface', cfg.StrOpt('default_storage_interface',
help=_DEFAULT_IFACE_HELP.format('storage')), help=_DEFAULT_IFACE_HELP.format('storage')),
cfg.ListOpt('enabled_vendor_interfaces', cfg.ListOpt('enabled_vendor_interfaces',
default=['no-vendor'], default=['no-vendor'],
help=_ENABLED_IFACE_HELP.format('vendor')), help=_ENABLED_IFACE_HELP.format('vendor')),

4
ironic/tests/unit/common/test_cinder.py
View File

@ -72,10 +72,10 @@ class TestCinderClient(base.TestCase):
def test_get_client_with_endpoint_override( def test_get_client_with_endpoint_override(
self, mock_client_init, mock_session): self, mock_client_init, mock_session):
self.config(url='test-url', group='cinder') self.config(url='http://test-url', group='cinder')
mock_session_obj = mock.Mock() mock_session_obj = mock.Mock()
expected = {'connect_retries': 2, expected = {'connect_retries': 2,
'endpoint_override': 'test-url', 'endpoint_override': 'http://test-url',
'session': mock_session_obj} 'session': mock_session_obj}
mock_session.return_value = mock_session_obj mock_session.return_value = mock_session_obj
mock_client_init.return_value = None mock_client_init.return_value = None