x/packstack
Code Issues Proposed changes

Merge "Use correct endpoint name"

Browse Source
This commit is contained in:
Jenkins 2016-02-23 09:14:50 +00:00 committed by Gerrit Code Review
commit 49c7d2ee41
1 changed files with 8 additions and 6 deletions
Show Stats 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)