Fix wsgi app creation
The use of the keystone_wsgi_file that we copy in order to create our keystone apps is deprecated and the file will be removed for Ocata. So we switch to using the variant provided by upstream instead. Change-Id: I8970d4ee9692fd13d52b2304ff3a1ae93b693500
This commit is contained in:
parent
2f858e3678
commit
1bb86dd4ce
|
@ -274,30 +274,16 @@ directory keystone_apache_dir do
|
|||
mode 00755
|
||||
end
|
||||
|
||||
server_entry_main = "#{keystone_apache_dir}/main"
|
||||
server_entry_admin = "#{keystone_apache_dir}/admin"
|
||||
|
||||
# Note: Using lazy here as the wsgi file is not available until after
|
||||
# the keystone package is installed during execution phase.
|
||||
[server_entry_main, server_entry_admin].each do |server_entry|
|
||||
file server_entry do
|
||||
content lazy { IO.read(platform_options['keystone_wsgi_file']) }
|
||||
owner 'root'
|
||||
group 'root'
|
||||
mode 00755
|
||||
end
|
||||
end
|
||||
|
||||
wsgi_apps = {
|
||||
'main' => {
|
||||
server_host: main_bind_address,
|
||||
server_port: main_bind_service.port,
|
||||
server_entry: server_entry_main
|
||||
server_entry: '/usr/bin/keystone-wsgi-public'
|
||||
},
|
||||
'admin' => {
|
||||
server_host: admin_bind_address,
|
||||
server_port: admin_bind_service.port,
|
||||
server_entry: server_entry_admin
|
||||
server_entry: '/usr/bin/keystone-wsgi-admin'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -357,24 +357,6 @@ describe 'openstack-identity::server-apache' do
|
|||
end
|
||||
end
|
||||
|
||||
it 'creates directory /var/www/html/keystone' do
|
||||
expect(chef_run).to create_directory('/var/www/html/keystone').with(
|
||||
user: 'root',
|
||||
group: 'root',
|
||||
mode: 00755
|
||||
)
|
||||
end
|
||||
|
||||
it 'creates wsgi files' do
|
||||
%w(main admin).each do |file|
|
||||
expect(chef_run).to create_file("/var/www/html/keystone/#{file}").with(
|
||||
user: 'root',
|
||||
group: 'root',
|
||||
mode: 00755
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'apache wsgi' do
|
||||
['/etc/apache2/sites-available/keystone-main.conf',
|
||||
'/etc/apache2/sites-available/keystone-admin.conf'].each do |file|
|
||||
|
@ -446,7 +428,7 @@ describe 'openstack-identity::server-apache' do
|
|||
[/^<VirtualHost 127.0.0.1:5000>$/,
|
||||
/^ WSGIDaemonProcess keystone-main/,
|
||||
/^ WSGIProcessGroup keystone-main$/,
|
||||
%r{^ WSGIScriptAlias / /var/www/html/keystone/main$}].each do |line|
|
||||
%r{^ WSGIScriptAlias / /usr/bin/keystone-wsgi-public$}].each do |line|
|
||||
expect(chef_run).to render_file('/etc/apache2/sites-available/keystone-main.conf').with_content(line)
|
||||
end
|
||||
end
|
||||
|
@ -457,7 +439,7 @@ describe 'openstack-identity::server-apache' do
|
|||
[/^<VirtualHost 127.0.0.1:35357>$/,
|
||||
/^ WSGIDaemonProcess keystone-admin/,
|
||||
/^ WSGIProcessGroup keystone-admin$/,
|
||||
%r{^ WSGIScriptAlias / /var/www/html/keystone/admin$}].each do |line|
|
||||
%r{^ WSGIScriptAlias / /usr/bin/keystone-wsgi-admin$}].each do |line|
|
||||
expect(chef_run).to render_file('/etc/apache2/sites-available/keystone-admin.conf').with_content(line)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -14,6 +14,10 @@
|
|||
LogLevel debug
|
||||
<% end -%>
|
||||
|
||||
<Directory /usr/bin>
|
||||
Require all granted
|
||||
</Directory>
|
||||
|
||||
<% if @params[:use_ssl] -%>
|
||||
SSLEngine On
|
||||
SSLCertificateFile <%= @params[:cert_file] %>
|
||||
|
|
Loading…
Reference in New Issue