stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge "Changing who is affected by the sysctl tunning"

Browse Source
This commit is contained in:
Jenkins
2015-04-17 16:28:15 +00:00
committed by Gerrit Code Review
parent 3ab3b139fd 9267538fc8
commit 4426f88b20
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/object.pp
View File

@@ -30,6 +30,4 @@ class cloud::object(
swift_hash_suffix => $swift_hash_suffix, swift_hash_suffix => $swift_hash_suffix,
} }
class {'cloud::object::tweaking': }
} }

2
manifests/object/storage.pp
View File

@@ -75,6 +75,8 @@ class cloud::object::storage(
include 'cloud::object' include 'cloud::object'
include 'cloud::object::tweaking'
class { 'swift::storage': class { 'swift::storage':
storage_local_net_ip => $storage_eth, storage_local_net_ip => $storage_eth,
} }

2
manifests/object/tweaking.pp
View File

@@ -22,7 +22,7 @@ class cloud::object::tweaking {
'net.ipv4.tcp_tw_recycle' => { value => 1 }, 'net.ipv4.tcp_tw_recycle' => { value => 1 },
'net.ipv4.tcp_tw_reuse' => { value => 1 }, 'net.ipv4.tcp_tw_reuse' => { value => 1 },
'net.ipv4.tcp_syncookies' => { value => 0 }, 'net.ipv4.tcp_syncookies' => { value => 0 },
'net.ipv4.ip_local_port_range' => { value => "1024\t65000" }, 'net.ipv4.ip_local_port_range' => { value => "10000\t65000" },
'net.core.netdev_max_backlog' => { value => 300000 }, 'net.core.netdev_max_backlog' => { value => 300000 },
'net.ipv4.tcp_sack' => { value => 0 }, 'net.ipv4.tcp_sack' => { value => 0 },
} }

4
spec/classes/cloud_object_storage_spec.rb
View File

@@ -39,6 +39,10 @@ describe 'cloud::object::storage' do
'storage_local_net_ip' => '127.0.0.1', 'storage_local_net_ip' => '127.0.0.1',
}) })
is_expected.to contain_sysctl('net.ipv4.ip_local_port_range').with(
:val => "10000\t65000",
)
is_expected.to contain_swift__storage__server('6000').with({ is_expected.to contain_swift__storage__server('6000').with({
'type' => 'object', 'type' => 'object',
'config_file_path' => 'object-server.conf', 'config_file_path' => 'object-server.conf',