Drop unnecessary memcached::max_memory
Because we do not deploy memcached actually we don't have to set this tuning option. Change-Id: I972c3d3fd596d47ef4f984df716fcf3eece9c108
This commit is contained in:
@@ -7,7 +7,7 @@ describe 'swift::containerreconciler' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
'class { "memcached": max_memory => 1 }'
|
'class { "memcached": }'
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples 'swift::container::reconciler' do
|
shared_examples 'swift::container::reconciler' do
|
||||||
|
@@ -11,7 +11,7 @@ describe 'swift::internal_client::cache' do
|
|||||||
|
|
||||||
describe 'with memcached dependency' do
|
describe 'with memcached dependency' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
'class { "memcached": max_memory => 1 }'
|
'class { "memcached": }'
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'with defaults' do
|
describe 'with defaults' do
|
||||||
|
@@ -4,7 +4,7 @@ describe 'swift::internal_client' do
|
|||||||
shared_examples 'swift::internal_client' do
|
shared_examples 'swift::internal_client' do
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { memcached: max_memory => 1}
|
"class { memcached: }
|
||||||
class { swift: swift_hash_path_suffix => string }
|
class { swift: swift_hash_path_suffix => string }
|
||||||
include swift::internal_client::catch_errors
|
include swift::internal_client::catch_errors
|
||||||
include swift::internal_client::proxy_logging
|
include swift::internal_client::proxy_logging
|
||||||
|
@@ -7,7 +7,7 @@ describe 'swift::objectexpirer' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
'class { "memcached": max_memory => 1 }'
|
'class { "memcached": }'
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples 'swift::objectexpirer' do
|
shared_examples 'swift::objectexpirer' do
|
||||||
|
@@ -11,7 +11,7 @@ describe 'swift::proxy::cache' do
|
|||||||
|
|
||||||
describe 'with memcached dependency' do
|
describe 'with memcached dependency' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
'class { "memcached": max_memory => 1 }'
|
'class { "memcached": }'
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'with defaults' do
|
describe 'with defaults' do
|
||||||
|
@@ -8,7 +8,7 @@ describe 'swift::proxy' do
|
|||||||
|
|
||||||
describe 'with proper dependencies' do
|
describe 'with proper dependencies' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { memcached: max_memory => 1}
|
"class { memcached: }
|
||||||
class { swift: swift_hash_path_suffix => string }
|
class { swift: swift_hash_path_suffix => string }
|
||||||
include swift::proxy::catch_errors
|
include swift::proxy::catch_errors
|
||||||
include swift::proxy::gatekeeper
|
include swift::proxy::gatekeeper
|
||||||
@@ -114,7 +114,7 @@ describe 'swift::proxy' do
|
|||||||
describe "when using swift_proxy_config resource" do
|
describe "when using swift_proxy_config resource" do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"
|
"
|
||||||
class { memcached: max_memory => 1}
|
class { memcached: }
|
||||||
class { swift: swift_hash_path_suffix => string }
|
class { swift: swift_hash_path_suffix => string }
|
||||||
swift_proxy_config { 'foo/bar': value => 'foo' }
|
swift_proxy_config { 'foo/bar': value => 'foo' }
|
||||||
include swift::proxy::catch_errors
|
include swift::proxy::catch_errors
|
||||||
@@ -131,7 +131,7 @@ describe 'swift::proxy' do
|
|||||||
|
|
||||||
describe 'when more parameters are set' do
|
describe 'when more parameters are set' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { memcached: max_memory => 1}
|
"class { memcached: }
|
||||||
class { swift: swift_hash_path_suffix => string }"
|
class { swift: swift_hash_path_suffix => string }"
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -229,7 +229,7 @@ describe 'swift::proxy' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { memcached: max_memory => 1}
|
"class { memcached: }
|
||||||
class { swift: swift_hash_path_suffix => string }
|
class { swift: swift_hash_path_suffix => string }
|
||||||
include swift::proxy::tempauth
|
include swift::proxy::tempauth
|
||||||
"
|
"
|
||||||
@@ -311,7 +311,7 @@ describe 'swift::proxy' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { memcached: max_memory => 1}
|
"class { memcached: }
|
||||||
class { swift: swift_hash_path_suffix => string }
|
class { swift: swift_hash_path_suffix => string }
|
||||||
include swift::proxy::catch_errors
|
include swift::proxy::catch_errors
|
||||||
include swift::proxy::gatekeeper
|
include swift::proxy::gatekeeper
|
||||||
|
@@ -10,7 +10,7 @@ describe 'swift::ringbuilder' do
|
|||||||
|
|
||||||
describe 'when swift class is included' do
|
describe 'when swift class is included' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { memcached: max_memory => 1}
|
"class { memcached: }
|
||||||
class { swift: swift_hash_path_suffix => string }"
|
class { swift: swift_hash_path_suffix => string }"
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ describe 'swift::ringbuilder' do
|
|||||||
|
|
||||||
describe 'when specifying ring devices' do
|
describe 'when specifying ring devices' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
'class { memcached: max_memory => 1}
|
'class { memcached: }
|
||||||
class { swift: swift_hash_path_suffix => string }
|
class { swift: swift_hash_path_suffix => string }
|
||||||
ring_object_device { "127.0.0.1:6000/1":
|
ring_object_device { "127.0.0.1:6000/1":
|
||||||
zone => 1,
|
zone => 1,
|
||||||
|
@@ -13,7 +13,7 @@ describe 'swift::ringbuilder::policy_ring' do
|
|||||||
|
|
||||||
describe 'when swift class is included and policy is >= 1' do
|
describe 'when swift class is included and policy is >= 1' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { memcached: max_memory => 1}
|
"class { memcached: }
|
||||||
class { swift: swift_hash_path_suffix => string }"
|
class { swift: swift_hash_path_suffix => string }"
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -46,7 +46,7 @@ describe 'swift::ringbuilder::policy_ring' do
|
|||||||
|
|
||||||
describe 'when specifying ring devices' do
|
describe 'when specifying ring devices' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
'class { memcached: max_memory => 1}
|
'class { memcached: }
|
||||||
class { swift: swift_hash_path_suffix => string }
|
class { swift: swift_hash_path_suffix => string }
|
||||||
ring_object_device { "1:127.0.0.1:6000/1":
|
ring_object_device { "1:127.0.0.1:6000/1":
|
||||||
zone => 1,
|
zone => 1,
|
||||||
|
Reference in New Issue
Block a user