Merge "Need WEBROOT in local_settings.py file"
This commit is contained in:
commit
4294dd9b57
|
@ -222,6 +222,10 @@ describe 'openstack-dashboard::horizon' do
|
|||
end
|
||||
end
|
||||
|
||||
it 'does have webroot set' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^WEBROOT = \'\/\'$/)
|
||||
end
|
||||
|
||||
it 'does not have urls set' do
|
||||
[
|
||||
/^LOGIN_URL =$/,
|
||||
|
|
|
@ -9,6 +9,8 @@ from openstack_dashboard import exceptions
|
|||
DEBUG = <%= node["openstack"]["dashboard"]["debug"] ? "True" : "False" %>
|
||||
TEMPLATE_DEBUG = DEBUG
|
||||
|
||||
WEBROOT = '<%= node['openstack']['dashboard']['webroot'] %>'
|
||||
|
||||
<% if node["openstack"]["dashboard"]["login_url"] %>
|
||||
LOGIN_URL = '<%= node['openstack']['dashboard']['login_url'] %>'
|
||||
<% end %>
|
||||
|
|
Loading…
Reference in New Issue