summaryrefslogtreecommitdiffstats
path: root/puppet/services/cinder-api.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-27 15:47:28 +0000
committerGerrit Code Review <review@openstack.org>2017-02-27 15:47:28 +0000
commit721faef63167d8d96725da69549524904d83d052 (patch)
treedc33a282451ce603eb4fd4e77cda6f30fbf47fea /puppet/services/cinder-api.yaml
parent35ccc61dbeaa246278a9466a3b40736f157f827b (diff)
parent09d8c1278604cc2aec42b7284c01cf7eb8b074b6 (diff)
Merge "Update the Nova Endpoint information for Cinder"
Diffstat (limited to 'puppet/services/cinder-api.yaml')
-rw-r--r--puppet/services/cinder-api.yaml3
1 files changed, 2 insertions, 1 deletions
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: