dashboard: improve Apache configuration

- Disable default vhost in Apache2
- Enable Listen to fix binding on HTTP/HTTPS port

Bug #404
This commit is contained in:
Emilien Macchi
2014-04-11 11:46:46 +02:00
parent 16f4132f67
commit 1c0565d2b7
2 changed files with 11 additions and 2 deletions

View File

@@ -94,6 +94,14 @@ class cloud::dashboard(
# We build the param needed for horizon class # We build the param needed for horizon class
$keystone_url = "${keystone_proto}://${keystone_host}:${keystone_port}/v2.0" $keystone_url = "${keystone_proto}://${keystone_host}:${keystone_port}/v2.0"
# Apache2 specific configuration
$vhost_extra_params = {
'add_listen' => true
}
ensure_resource('class', 'apache', {
default_vhost => false
})
class { 'horizon': class { 'horizon':
secret_key => $secret_key, secret_key => $secret_key,
can_set_mount_point => 'False', can_set_mount_point => 'False',
@@ -112,7 +120,7 @@ class cloud::dashboard(
horizon_cert => $horizon_cert, horizon_cert => $horizon_cert,
horizon_key => $horizon_key, horizon_key => $horizon_key,
horizon_ca => $horizon_ca, horizon_ca => $horizon_ca,
vhost_extra_params => { 'add_listen' => false } vhost_extra_params => $vhost_extra_params
} }
if ($::osfamily == 'Debian') { if ($::osfamily == 'Debian') {

View File

@@ -48,8 +48,9 @@ describe 'cloud::dashboard' do
:keystone_url => 'http://keystone.openstack.org:5000/v2.0', :keystone_url => 'http://keystone.openstack.org:5000/v2.0',
:django_debug => true, :django_debug => true,
:neutron_options => { 'enable_lb' => true }, :neutron_options => { 'enable_lb' => true },
:vhost_extra_params => { 'add_listen' => false } :vhost_extra_params => { 'add_listen' => true }
) )
should contain_class('apache').with(:default_vhost => false)
end end
end end