openstack
/
cinder
Code Issues Proposed changes

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
This commit is contained in:
Sean Dague 2017-02-13 16:34:29 -05:00
parent cfc617b0ce
commit 95550a5095
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/compute/nova.py
View File

@ -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 '

2
cinder/tests/unit/compute/test_nova.py
View File

@ -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')