Merge "Changing who is affected by the sysctl tunning"

manifests/object.pp

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

manifests/object/storage.pp

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

manifests/object/tweaking.pp

@@ -22,7 +22,7 @@ class cloud::object::tweaking {
     'net.ipv4.tcp_tw_recycle'                           => { value => 1 },
     'net.ipv4.tcp_tw_reuse'                             => { value => 1 },
     '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.ipv4.tcp_sack'                                 => { value => 0 },
   }

spec/classes/cloud_object_storage_spec.rb

@@ -39,6 +39,10 @@ describe 'cloud::object::storage' do
         '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({
         'type'                   => 'object',
         'config_file_path'       => 'object-server.conf',