stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #261 from enovance/bug/258/goneri

Browse Source 
Bug/258/goneri
This commit is contained in:
Emilien Macchi
2014-02-17 16:32:21 +01:00
parent 54266e815b 57cb3dc114
commit 51938949dc
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/dashboard.pp
View File

@@ -57,10 +57,6 @@
# (optional) Enable debug or not. # (optional) Enable debug or not.
#  Defaults to params. #  Defaults to params.
# #
# [*cache_server_ip*]
# (optionnal) Memcached IP address
# Defaults in params
#
class cloud::dashboard( class cloud::dashboard(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
@@ -71,7 +67,6 @@ class cloud::dashboard(
$keystone_host = $os_params::ks_keystone_internal_host, $keystone_host = $os_params::ks_keystone_internal_host,
$keystone_proto = $os_params::ks_keystone_internal_proto, $keystone_proto = $os_params::ks_keystone_internal_proto,
$keystone_port = $os_params::ks_keystone_internal_port, $keystone_port = $os_params::ks_keystone_internal_port,
$cache_server_ip = $os_params::internal_netif_ip,
$debug = $os_params::debug $debug = $os_params::debug
) { ) {
@@ -88,7 +83,7 @@ class cloud::dashboard(
bind_address => $api_eth, bind_address => $api_eth,
swift => true, swift => true,
keystone_url => $keystone_url, keystone_url => $keystone_url,
cache_server_ip => $cache_server_ip, cache_server_ip => false,
django_debug => $debug django_debug => $debug
} }

3
spec/classes/cloud_dashboard_spec.rb
View File

@@ -31,7 +31,6 @@ describe 'cloud::dashboard' do
:keystone_proto => 'http', :keystone_proto => 'http',
:keystone_port => '5000', :keystone_port => '5000',
:debug => true, :debug => true,
:cache_server_ip => '10.0.0.1',
:api_eth => '10.0.0.1' } :api_eth => '10.0.0.1' }
end end
@@ -43,7 +42,7 @@ describe 'cloud::dashboard' do
:fqdn => '10.0.0.1', :fqdn => '10.0.0.1',
:bind_address => '10.0.0.1', :bind_address => '10.0.0.1',
:swift => true, :swift => true,
:cache_server_ip => '10.0.0.1', :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
) )