stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #255 from enovance/bug/254/emilien

Browse Source 
dashboard: configure memcache server
This commit is contained in:
Gonéri Le Bouder
2014-02-17 14:25:19 +01:00
parent 972cc8f8dc 4e17ce1629
commit 57f8913c65
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/dashboard.pp
View File

@@ -57,6 +57,10 @@
# (optional) Enable debug or not.
#  Defaults to params.
#
# [*cache_server_ip*]
# (optionnal) Memcached IP address
# Defaults in params
#
class cloud::dashboard(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
@@ -67,6 +71,7 @@ class cloud::dashboard(
$keystone_host = $os_params::ks_keystone_internal_host,
$keystone_proto = $os_params::ks_keystone_internal_proto,
$keystone_port = $os_params::ks_keystone_internal_port,
$cache_server_ip = $os_params::internal_netif_ip,
$debug = $os_params::debug
) {
@@ -79,11 +84,12 @@ class cloud::dashboard(
# fqdn can can be ambiguous since we use reverse DNS here,
# e.g: 127.0.0.1 instead of a public IP address.
# We force $api_eth to avoid this situation
fqdn => $api_eth,
bind_address => $api_eth,
swift => true,
keystone_url => $keystone_url,
django_debug => $debug
fqdn => $api_eth,
bind_address => $api_eth,
swift => true,
keystone_url => $keystone_url,
cache_server_ip => $cache_server_ip,
django_debug => $debug
}

2
spec/classes/cloud_dashboard_spec.rb
View File

@@ -31,6 +31,7 @@ describe 'cloud::dashboard' do
:keystone_proto => 'http',
:keystone_port => '5000',
:debug => true,
:cache_server_ip => '10.0.0.1',
:api_eth => '10.0.0.1' }
end
@@ -42,6 +43,7 @@ describe 'cloud::dashboard' do
:fqdn => '10.0.0.1',
:bind_address => '10.0.0.1',
:swift => true,
:cache_server_ip => '10.0.0.1',
:keystone_url => 'http://keystone.openstack.org:5000/v2.0',
:django_debug => true
)