openstack/cookbook-openstack-identity
Code Issues Proposed changes

Merge "Re-ordering keystone templates."

Browse Source
This commit is contained in:
Jenkins
2014-05-07 13:20:01 +00:00
committed by Gerrit Code Review
parent 24785cc87b 07164e751d
commit 4ccd865d37
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
recipes/server.rb
View File

@@ -173,6 +173,18 @@ public_endpoint = "#{ie.scheme}://#{ie.host}:#{ie.port}/"
ae = identity_admin_endpoint
admin_endpoint = "#{ae.scheme}://#{ae.host}:#{ae.port}/"
# If a keystone-paste.ini is specified use it
if node['openstack']['identity']['pastefile_url']
remote_file '/etc/keystone/keystone-paste.ini' do
source node['openstack']['identity']['pastefile_url']
owner node['openstack']['identity']['user']
group node['openstack']['identity']['group']
mode 00644
notifies :restart, 'service[keystone]', :delayed
end
end
template '/etc/keystone/keystone.conf' do
source 'keystone.conf.erb'
owner node['openstack']['identity']['user']
@@ -191,19 +203,7 @@ template '/etc/keystone/keystone.conf' do
token_expiration: node['openstack']['identity']['token']['expiration']
)
notifies :restart, 'service[keystone]', :delayed
end
# If a keystone-paste.ini is specified use it
if node['openstack']['identity']['pastefile_url']
remote_file '/etc/keystone/keystone-paste.ini' do
source node['openstack']['identity']['pastefile_url']
owner node['openstack']['identity']['user']
group node['openstack']['identity']['group']
mode 00644
notifies :restart, 'service[keystone]', :immediately
end
notifies :restart, 'service[keystone]', :immediately
end
# populate the templated catlog, if you're using the templated catalog backend