x/packstack
Code Issues Proposed changes

Use correct endpoint name

Browse Source 
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
This commit is contained in:
Martin Mágr
2016-02-18 18:49:12 +01:00
parent 38a9415341
commit 05a137973e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packstack/puppet/templates/cinder.pp
View File

@@ -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'
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)