From 1d44d3d8ea95bc73d915436fbce5e94e4a56d6ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Fri, 31 Jan 2014 14:53:34 +0100 Subject: [PATCH] apply some changes suggested by Emilien https://github.com/enovance/puppet-cloud/pull/121 --- manifests/dashboard.pp | 3 --- spec/classes/cloud_dashboard_spec.rb | 3 --- 2 files changed, 6 deletions(-) diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 8be34f9e..5ac7ab62 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -86,9 +86,6 @@ class cloud::dashboard( # We force $api_eth to avoid this situation fqdn => $api_eth, bind_address => $api_eth, -# TODO(Gonéri) disabling cache so far: -# https://github.com/enovance/puppet-cloud/pull/121 -# cache_server_ip => $api_eth, swift => true, keystone_url => $keystone_url, django_debug => $debug diff --git a/spec/classes/cloud_dashboard_spec.rb b/spec/classes/cloud_dashboard_spec.rb index 254f4e5e..83bcd005 100644 --- a/spec/classes/cloud_dashboard_spec.rb +++ b/spec/classes/cloud_dashboard_spec.rb @@ -41,7 +41,6 @@ describe 'cloud::dashboard' do :can_set_mount_point => 'False', :fqdn => '10.0.0.1', :bind_address => '10.0.0.1', - :cache_server_ip => '10.0.0.1', :swift => true, :keystone_url => 'http://keystone.openstack.org:5000/v2.0', :django_debug => true @@ -54,7 +53,6 @@ describe 'cloud::dashboard' do { :osfamily => 'Debian', :operatingsystem => 'Ubuntu', :operatingsystemrelease => '12.04', - :memorysize => '1000 MB', :processorcount => '1', :concat_basedir => '/var/lib/puppet/concat' } end @@ -66,7 +64,6 @@ describe 'cloud::dashboard' do let :facts do { :osfamily => 'RedHat', :operatingsystemrelease => '6', - :memorysize => '1000 MB', :processorcount => '1', :concat_basedir => '/var/lib/puppet/concat' } end