x/packstack
Code Issues Proposed changes

[Horizon] switch from fqdn option to allowed_hosts and server_aliases

Browse Source 
Conflicts:
        packstack/puppet/templates/horizon.pp

Change-Id: Id7141dddb5e4b3ed16347bcb3091bba6a8d52ce3
(cherry picked from commit 200066d321)
This commit is contained in:
Lukas Bezdicka
2015-01-14 09:19:39 -05:00
committed by Gael Chamoulaud
parent b02c590d91
commit f3425ac0ad
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packstack/puppet/templates/horizon.pp
View File

@@ -18,13 +18,8 @@ class {'horizon':
secret_key => hiera('CONFIG_HORIZON_SECRET_KEY'), secret_key => hiera('CONFIG_HORIZON_SECRET_KEY'),
keystone_url => "http://${keystone_host}:5000/v2.0", keystone_url => "http://${keystone_host}:5000/v2.0",
keystone_default_role => '_member_', keystone_default_role => '_member_',
# fqdn => [hiera('CONFIG_CONTROLLER_HOST'), "$::fqdn", 'localhost'], server_aliases => [hiera('CONFIG_CONTROLLER_HOST'), "$::fqdn", 'localhost'],
# TO-DO: Parameter fqdn is used both for ALLOWED_HOSTS in settings_local.py allowed_hosts => '*',
# and for ServerAlias directives in vhost.conf which is breaking server
# accessibility. We need ALLOWED_HOSTS values, but we have to avoid
# ServerAlias definitions. For now we will use this wildcard hack until
# puppet-horizon will have separate parameter for each config.
fqdn => '*',
hypervisor_options => {'can_set_mount_point' => false, }, hypervisor_options => {'can_set_mount_point' => false, },
compress_offline => false, compress_offline => false,
django_debug => $is_django_debug, django_debug => $is_django_debug,