From: Rhys Oxenham <roxenham@redhat.com>
Date: Wed, 22 Feb 2017 21:20:40 +0000 (-0500)
Subject: Update the Nova Endpoint information for Cinder
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7a08ed7a13220b35493aa7c1b9dd712ffb8a4c33;p=apex-tripleo-heat-templates.git

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 09d8c1278604cc2aec42b7284c01cf7eb8b074b6)
---

diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 8c5a07ac..bde3e044 100644
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -86,7 +86,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: