openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Update the Nova Endpoint information for Cinder 

This patch updates the Cinder service to reference the correct
catalogue entries for Nova as configured by TripleO. The default
settings as set by TripleO do not match our catalogue entries,
and when Cinder attempts to callback to Nova in certain events
(such as a Cinder volume retype) it can raise an EndpointNotFound
error.

Out of the box we have settings in /etc/cinder/cinder.conf like:

nova_catalog_info = compute:Compute Service:internalURL

With the format as "<service_type>:<service_name>:<endpoint_type>"

Yet our catalogue has no mention of 'Compute Service'. This patch
also fixes the reference for the adminURL also.

Related-Bug: #1668281

Change-Id: I888ee07ef02d82578867e33608901c06e6478472
Co-Authored-By: Greg Charot <gcharot@redhat.com>
(cherry picked from commit 09d8c12786)
(cherry picked from commit 7a08ed7a13)
This commit is contained in:
Rhys Oxenham 2017-02-22 16:20:40 -05:00
parent 18f46213cb
commit 31a4bb9965
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
puppet/services/cinder-api.yaml
View File

@ -67,7 +67,8 @@ outputs:
cinder::keystone::authtoken::project_name: 'service'
cinder::api::enable_proxy_headers_parsing: true
cinder::api::nova_catalog_info: 'compute:Compute Service:internalURL'
cinder::api::nova_catalog_info: 'compute:nova:internalURL'
cinder::api::nova_catalog_admin_info: 'compute:nova:adminURL'
# TODO(emilien) move it to puppet-cinder
cinder::config:
DEFAULT/swift_catalog_info: