Fix dashboard settings
- Add wsgi option to vhost definition - Remove duplicated entries in template - Do not set Xen option when we deploy KVM Change-Id: I3e40674cbdfa116afa46e845dbd165f0d5abc7d0
This commit is contained in:
parent
7742a929dc
commit
bc49cefc80
@ -18,7 +18,7 @@ describe 'openstack-dashboard::apache2-server' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
describe 'certs' do
|
describe 'certs' do
|
||||||
describe 'get seceret' do
|
describe 'get secret' do
|
||||||
let(:pem) { chef_run.file('/etc/pki/tls/certs/horizon.pem') }
|
let(:pem) { chef_run.file('/etc/pki/tls/certs/horizon.pem') }
|
||||||
let(:key) { chef_run.file('/etc/pki/tls/private/horizon.key') }
|
let(:key) { chef_run.file('/etc/pki/tls/private/horizon.key') }
|
||||||
|
|
||||||
|
@ -35,6 +35,9 @@ NameVirtualHost <%= @https_bind_address %>:<%= @https_bind_port %>
|
|||||||
<% end -%>
|
<% end -%>
|
||||||
<% end %>
|
<% end %>
|
||||||
ServerAdmin <%= node["apache"]["contact"] %>
|
ServerAdmin <%= node["apache"]["contact"] %>
|
||||||
|
# Note(jr): This is needed when SSL is used for the services, see
|
||||||
|
# https://bugs.launchpad.net/openstack-ansible/+bug/1624791/comments/17
|
||||||
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
WSGIScriptAlias <%= node["openstack"]["dashboard"]["webroot"] %> <%= node["openstack"]["dashboard"]["wsgi_path"] %>
|
WSGIScriptAlias <%= node["openstack"]["dashboard"]["webroot"] %> <%= node["openstack"]["dashboard"]["wsgi_path"] %>
|
||||||
WSGIDaemonProcess dashboard user=<%= node['openstack']['dashboard']['horizon_user'] %> group=<%= node['openstack']['dashboard']['horizon_group'] %> processes=3 threads=10 python-path=<%= node["openstack"]["dashboard"]["dash_path"] %>
|
WSGIDaemonProcess dashboard user=<%= node['openstack']['dashboard']['horizon_user'] %> group=<%= node['openstack']['dashboard']['horizon_group'] %> processes=3 threads=10 python-path=<%= node["openstack"]["dashboard"]["dash_path"] %>
|
||||||
WSGIProcessGroup dashboard
|
WSGIProcessGroup dashboard
|
||||||
|
@ -162,9 +162,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
|
|||||||
OPENSTACK_HOST = "<%= @host %>"
|
OPENSTACK_HOST = "<%= @host %>"
|
||||||
OPENSTACK_KEYSTONE_URL = "<%= @auth_uri %>"
|
OPENSTACK_KEYSTONE_URL = "<%= @auth_uri %>"
|
||||||
OPENSTACK_KEYSTONE_ADMIN_URL = "<%= @auth_admin_uri %>"
|
OPENSTACK_KEYSTONE_ADMIN_URL = "<%= @auth_admin_uri %>"
|
||||||
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'Default'
|
|
||||||
OPENSTACK_KEYSTONE_DEFAULT_ROLE = "<%= node["openstack"]["dashboard"]["keystone_default_role"] %>"
|
OPENSTACK_KEYSTONE_DEFAULT_ROLE = "<%= node["openstack"]["dashboard"]["keystone_default_role"] %>"
|
||||||
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True
|
|
||||||
OPENSTACK_KEYSTONE_ADMIN_ROLES = ["admin"]
|
OPENSTACK_KEYSTONE_ADMIN_ROLES = ["admin"]
|
||||||
|
|
||||||
<% if node["openstack"]["dashboard"]["use_ssl"] %>
|
<% if node["openstack"]["dashboard"]["use_ssl"] %>
|
||||||
@ -203,7 +201,7 @@ OPENSTACK_KEYSTONE_BACKEND = {
|
|||||||
# can_set_mount_point to True will add the option to set the mount point
|
# can_set_mount_point to True will add the option to set the mount point
|
||||||
# from the UI.
|
# from the UI.
|
||||||
OPENSTACK_HYPERVISOR_FEATURES = {
|
OPENSTACK_HYPERVISOR_FEATURES = {
|
||||||
'can_set_mount_point': True,
|
'can_set_mount_point': False,
|
||||||
'can_set_password': False,
|
'can_set_password': False,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user