stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #277 from enovance/bug/276/emilien

Browse Source 
dashboard: add LBaaS panel
This commit is contained in:
Emilien Macchi 2014-02-22 15:16:41 +01:00
commit 620bb69399
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/dashboard.pp
View File

@ -73,7 +73,7 @@ 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"
class {'horizon': class { 'horizon':
secret_key => $secret_key, secret_key => $secret_key,
can_set_mount_point => 'False', can_set_mount_point => 'False',
# fqdn can can be ambiguous since we use reverse DNS here, # fqdn can can be ambiguous since we use reverse DNS here,
@ -84,8 +84,8 @@ class cloud::dashboard(
swift => true, swift => true,
keystone_url => $keystone_url, keystone_url => $keystone_url,
cache_server_ip => false, cache_server_ip => false,
django_debug => $debug django_debug => $debug,
neutron_options => { 'enable_lb' => true }
} }
if ($::osfamily == 'Debian') { if ($::osfamily == 'Debian') {

3
spec/classes/cloud_dashboard_spec.rb
View File

@ -44,7 +44,8 @@ describe 'cloud::dashboard' do
:swift => true, :swift => true,
:cache_server_ip => false, :cache_server_ip => false,
: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 }
) )
end end
end end