From d314a4f0593284198c3e08ee4cc9478c3851aed5 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 17 Feb 2014 13:48:02 +0100 Subject: [PATCH] dashboard: configure memcache server Close bug #254 Signed-off-by: Emilien Macchi --- manifests/dashboard.pp | 16 +++++++++++----- spec/classes/cloud_dashboard_spec.rb | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index f866b7e8..97f3a844 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -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 } diff --git a/spec/classes/cloud_dashboard_spec.rb b/spec/classes/cloud_dashboard_spec.rb index 83bcd005..91645567 100644 --- a/spec/classes/cloud_dashboard_spec.rb +++ b/spec/classes/cloud_dashboard_spec.rb @@ -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 )