diff --git a/cinder/compute/nova.py b/cinder/compute/nova.py
index addb0b095c1..03710cf7b9a 100644
--- a/cinder/compute/nova.py
+++ b/cinder/compute/nova.py
@@ -37,7 +37,7 @@ nova_opts = [
                     'the form: '
                     '<service_type>:<service_name>:<endpoint_type>'),
     cfg.StrOpt('nova_catalog_admin_info',
-               default='compute:Compute Service:adminURL',
+               default='compute:Compute Service:publicURL',
                help='Same as nova_catalog_info, but for admin endpoint.'),
     cfg.StrOpt('nova_endpoint_template',
                help='Override service catalog lookup with template for nova '
diff --git a/cinder/tests/unit/compute/test_nova.py b/cinder/tests/unit/compute/test_nova.py
index be2e3eb769d..f9206abbb62 100644
--- a/cinder/tests/unit/compute/test_nova.py
+++ b/cinder/tests/unit/compute/test_nova.py
@@ -36,6 +36,8 @@ class NovaClientTestCase(test.TestCase):
                              'http://novahost:8774/v2/%(project_id)s')
         self.override_config('nova_endpoint_admin_template',
                              'http://novaadmhost:4778/v2/%(project_id)s')
+        self.override_config('nova_catalog_admin_info',
+                             'compute:Compute Service:adminURL')
         self.override_config('os_privileged_user_name', 'adminuser')
         self.override_config('os_privileged_user_password', 'strongpassword')