From 8a60045d713a5299551a079c96117a5e032db63a Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 20 Feb 2014 01:38:36 +0100 Subject: [PATCH] dashboard: add LBaaS panel Close bug #276 Signed-off-by: Emilien Macchi --- manifests/dashboard.pp | 6 +++--- spec/classes/cloud_dashboard_spec.rb | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 287d68f2..7d17a652 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -73,7 +73,7 @@ class cloud::dashboard( # We build the param needed for horizon class $keystone_url = "${keystone_proto}://${keystone_host}:${keystone_port}/v2.0" - class {'horizon': + class { 'horizon': secret_key => $secret_key, can_set_mount_point => 'False', # fqdn can can be ambiguous since we use reverse DNS here, @@ -84,8 +84,8 @@ class cloud::dashboard( swift => true, keystone_url => $keystone_url, cache_server_ip => false, - django_debug => $debug - + django_debug => $debug, + neutron_options => { 'enable_lb' => true } } if ($::osfamily == 'Debian') { diff --git a/spec/classes/cloud_dashboard_spec.rb b/spec/classes/cloud_dashboard_spec.rb index 69f15368..a2f7a094 100644 --- a/spec/classes/cloud_dashboard_spec.rb +++ b/spec/classes/cloud_dashboard_spec.rb @@ -44,7 +44,8 @@ describe 'cloud::dashboard' do :swift => true, :cache_server_ip => false, :keystone_url => 'http://keystone.openstack.org:5000/v2.0', - :django_debug => true + :django_debug => true, + :neutron_options => { 'enable_lb' => true } ) end end