From 581a3c7fe237fb8948311cd299fb2c164ad40af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Mon, 17 Feb 2014 16:21:42 +0100 Subject: [PATCH 1/3] dashboard: disable memcached support memcached is not mandatory since Horizon is pretty light and bring more complexity. We disable it for the moment. Close bug #258 --- manifests/dashboard.pp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 97f3a844..c8df5b62 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -57,10 +57,6 @@ # (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, @@ -71,7 +67,6 @@ 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 ) { @@ -88,7 +83,7 @@ class cloud::dashboard( bind_address => $api_eth, swift => true, keystone_url => $keystone_url, - cache_server_ip => $cache_server_ip, + cache_server_ip => false, django_debug => $debug } From 9b4fd4353bedd85be65ed7f59e65779e9dbaa905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Mon, 17 Feb 2014 16:26:34 +0100 Subject: [PATCH 2/3] horizon: refresh the unit-test --- spec/classes/cloud_dashboard_spec.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/classes/cloud_dashboard_spec.rb b/spec/classes/cloud_dashboard_spec.rb index 91645567..83bcd005 100644 --- a/spec/classes/cloud_dashboard_spec.rb +++ b/spec/classes/cloud_dashboard_spec.rb @@ -31,7 +31,6 @@ 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 @@ -43,7 +42,6 @@ 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 ) From d00e6ac75010be079532022098ff65502e7f3b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Mon, 17 Feb 2014 16:30:20 +0100 Subject: [PATCH 3/3] dashboard: keep cache_server_ip key in hash keep cache_server_ip in cloud::dashboard expected parameters. --- spec/classes/cloud_dashboard_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/classes/cloud_dashboard_spec.rb b/spec/classes/cloud_dashboard_spec.rb index 83bcd005..69f15368 100644 --- a/spec/classes/cloud_dashboard_spec.rb +++ b/spec/classes/cloud_dashboard_spec.rb @@ -42,6 +42,7 @@ describe 'cloud::dashboard' do :fqdn => '10.0.0.1', :bind_address => '10.0.0.1', :swift => true, + :cache_server_ip => false, :keystone_url => 'http://keystone.openstack.org:5000/v2.0', :django_debug => true )