From f3425ac0ad99337fe94e71f6a0ce480560b54cf9 Mon Sep 17 00:00:00 2001 From: Lukas Bezdicka Date: Wed, 14 Jan 2015 09:19:39 -0500 Subject: [PATCH] [Horizon] switch from fqdn option to allowed_hosts and server_aliases Conflicts: packstack/puppet/templates/horizon.pp Change-Id: Id7141dddb5e4b3ed16347bcb3091bba6a8d52ce3 (cherry picked from commit 200066d3213d9c1cdde4ce1fabd4b97d7f80e0ae) --- packstack/puppet/templates/horizon.pp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packstack/puppet/templates/horizon.pp b/packstack/puppet/templates/horizon.pp index c191f728d..dffe895b7 100644 --- a/packstack/puppet/templates/horizon.pp +++ b/packstack/puppet/templates/horizon.pp @@ -18,13 +18,8 @@ class {'horizon': secret_key => hiera('CONFIG_HORIZON_SECRET_KEY'), keystone_url => "http://${keystone_host}:5000/v2.0", keystone_default_role => '_member_', - # fqdn => [hiera('CONFIG_CONTROLLER_HOST'), "$::fqdn", 'localhost'], - # TO-DO: Parameter fqdn is used both for ALLOWED_HOSTS in settings_local.py - # 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 => '*', + server_aliases => [hiera('CONFIG_CONTROLLER_HOST'), "$::fqdn", 'localhost'], + allowed_hosts => '*', hypervisor_options => {'can_set_mount_point' => false, }, compress_offline => false, django_debug => $is_django_debug,