diff --git a/nova/tests/unit/virt/ironic/test_client_wrapper.py b/nova/tests/unit/virt/ironic/test_client_wrapper.py
index 910f137366d4..c0741f82f2eb 100644
--- a/nova/tests/unit/virt/ironic/test_client_wrapper.py
+++ b/nova/tests/unit/virt/ironic/test_client_wrapper.py
@@ -81,7 +81,7 @@ class IronicClientWrapperTestCase(test.NoDBTestCase):
         # nova.utils.get_ksa_adapter().get_endpoint()
         self.get_ksa_adapter.assert_called_once_with(
             'baremetal', ksa_auth=self.get_auth_plugin.return_value,
-            ksa_session='session', min_version=(1, 38),
+            ksa_session='session', min_version=(1, 0),
             max_version=(1, ksa_disc.LATEST))
         expected = {'session': 'session',
             'max_retries': CONF.ironic.api_max_retries,
@@ -107,7 +107,7 @@ class IronicClientWrapperTestCase(test.NoDBTestCase):
         # nova.utils.get_endpoint_data
         self.get_ksa_adapter.assert_called_once_with(
             'baremetal', ksa_auth=self.get_auth_plugin.return_value,
-            ksa_session='session', min_version=(1, 38),
+            ksa_session='session', min_version=(1, 0),
             max_version=(1, ksa_disc.LATEST))
         # When get_endpoint_data raises any ServiceNotFound, None is returned.
         expected = {'session': 'session',
diff --git a/nova/virt/ironic/client_wrapper.py b/nova/virt/ironic/client_wrapper.py
index 2bdec27774e4..5a90edc1c9c0 100644
--- a/nova/virt/ironic/client_wrapper.py
+++ b/nova/virt/ironic/client_wrapper.py
@@ -117,14 +117,20 @@ class IronicClientWrapper(object):
                 ksa_adap = utils.get_ksa_adapter(
                     nova.conf.ironic.DEFAULT_SERVICE_TYPE,
                     ksa_auth=auth_plugin, ksa_session=sess,
-                    min_version=IRONIC_API_VERSION,
+                    min_version=(IRONIC_API_VERSION[0], 0),
                     max_version=(IRONIC_API_VERSION[0], ks_disc.LATEST))
                 ironic_url = ksa_adap.get_endpoint()
+                ironic_url_none_reason = 'returned None'
             except exception.ServiceNotFound:
                 # NOTE(efried): No reason to believe service catalog lookup
                 # won't also fail in ironic client init, but this way will
                 # yield the expected exception/behavior.
                 ironic_url = None
+                ironic_url_none_reason = 'raised ServiceNotFound'
+
+            if ironic_url is None:
+                LOG.warning("Could not discover ironic_url via keystoneauth1: "
+                            "Adapter.get_endpoint %s", ironic_url_none_reason)
 
         try:
             cli = ironic.client.get_client(IRONIC_API_VERSION[0],