x/packstack
Code Issues Proposed changes

Merge "[Keystone] Fix keystone::endpoint deprecation" into juno

Browse Source
This commit is contained in:
Jenkins
2015-01-29 08:27:50 +00:00
committed by Gerrit Code Review
parent 36c2625761 822a8d4a96
commit 857920ecb7
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,11 +29,15 @@ class { 'keystone::roles::admin':
admin_tenant => 'admin',
}
class { 'keystone::endpoint':
public_url => "http://${keystone_endpoint_cfg_ctrl_host}:5000",
internal_url => "http://${keystone_endpoint_cfg_ctrl_host}:5000",
admin_url => "http://${keystone_endpoint_cfg_ctrl_host}:35357",
region => hiera('CONFIG_KEYSTONE_REGION'),
keystone::resource::service_identity { 'keystone':
public_url => "http://${keystone_endpoint_cfg_ctrl_host}:5000",
internal_url => "http://${keystone_endpoint_cfg_ctrl_host}:5000",
admin_url => "http://${keystone_endpoint_cfg_ctrl_host}:35357",
region => hiera('CONFIG_KEYSTONE_REGION'),
service_type => 'identity',
service_description => 'OpenStack Identity Service',
configure_user => false,
configure_user_role => false,
}
# Run token flush every minute (without output so we won't spam admins)