From 95550a50956346542e947de50ca25b481f67dfaf Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 13 Feb 2017 16:34:29 -0500 Subject: [PATCH] Change nova_catalog_admin_info to default to publicURL The only services in OpenStack that have dedicated admin REST APIs that actually enforce different permissions at the API level are keystone and swift. Assuming there is a dedicated admin endpoint is an artifical construct. Change the default for the admin_info to be the normal public url. For sites that really want 2 different values here, they can have it, but default to the simpler thing. Change-Id: I92efc4639d37cb2736bae7e40707a853f1e72be6 --- cinder/compute/nova.py | 2 +- cinder/tests/unit/compute/test_nova.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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: ' '::'), 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')