From 490e674a48b6c28c7ab320a10190ab0e3e55008f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=A1gr?= Date: Thu, 18 Feb 2016 18:49:12 +0100 Subject: [PATCH] Use correct endpoint name Puppet modules does not use naming from default catalog, hence we have to override default values of DEFAULT/nova_catalog*_info in cinder.conf Change-Id: Ib8f43cd2dc5b473fd7cc3b072ae69769c92c1fa8 Closes-Bug: rhbz#1306547 (cherry picked from commit 05a137973ec8d0ebf7e8cbfa31753e2b18d546ea) --- packstack/puppet/templates/cinder.pp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packstack/puppet/templates/cinder.pp b/packstack/puppet/templates/cinder.pp index ab1342de2..d07fc755b 100644 --- a/packstack/puppet/templates/cinder.pp +++ b/packstack/puppet/templates/cinder.pp @@ -9,12 +9,14 @@ $bind_host = hiera('CONFIG_IP_VERSION') ? { } class { '::cinder::api': - bind_host => $bind_host, - keystone_password => hiera('CONFIG_CINDER_KS_PW'), - keystone_tenant => 'services', - keystone_user => 'cinder', - auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), - identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'), + bind_host => $bind_host, + keystone_password => hiera('CONFIG_CINDER_KS_PW'), + keystone_tenant => 'services', + keystone_user => 'cinder', + auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), + identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'), + nova_catalog_info => 'compute:nova:publicURL', + nova_catalog_admin_info => 'compute:nova:adminURL' } class { '::cinder::scheduler': }